summaryrefslogtreecommitdiff
path: root/src/core.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-09-23 21:31:18 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-09-23 21:31:18 +0200
commitb5beb9d8bf490019675ddbce274899f5a6ff9930 (patch)
tree708dc34fd1bcff1f8dd31be8c56a026a2df391b8 /src/core.py
parent700b11e42d8045e8f4ef53588aab8e44dd9ac010 (diff)
parent8845cdce8e84004e5e4878bfad84ec59ea2f68ac (diff)
downloadpoezio-b5beb9d8bf490019675ddbce274899f5a6ff9930.tar.gz
poezio-b5beb9d8bf490019675ddbce274899f5a6ff9930.tar.bz2
poezio-b5beb9d8bf490019675ddbce274899f5a6ff9930.tar.xz
poezio-b5beb9d8bf490019675ddbce274899f5a6ff9930.zip
Merge branch 256 into master
Diffstat (limited to 'src/core.py')
-rw-r--r--src/core.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/core.py b/src/core.py
index c47af752..f707070c 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1327,6 +1327,18 @@ class Core(object):
r.users = []
self.enable_private_tabs(room)
+ def get_bookmark_nickname(self, room_name):
+ """
+ Returns the nickname associated with a bookmark
+ or the default nickname
+ """
+ bookmarks = config.get('rooms', '').split(':')
+ jid = JID(room_name)
+ for bookmark in bookmarks:
+ if JID(bookmark).bare == jid.bare:
+ return JID(bookmark).resource
+ return self.own_nick
+
def command_bookmark(self, arg):
"""
/bookmark [room][/nick]