summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tabs.py24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/tabs.py b/src/tabs.py
index 2bf0c216..5b6dda56 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -423,6 +423,7 @@ class ChatTab(Tab):
for word in txt.split():
if len(word) >= 4 and word not in words:
words.append(word)
+ words.extend([word for word in config.get('words', '').split(':') if word])
self.input.auto_completion(words, ' ', quotify=False)
def on_enter(self):
@@ -1129,9 +1130,6 @@ class MucTab(ChatTab):
compare_users = lambda x: x.last_talked
word_list = [user.nick for user in sorted(self.users, key=compare_users, reverse=True)\
if user.nick != self.own_nick]
- word_list.extend(config.get('words', '').split(':'))
- if '' in word_list:
- word_list.remove('')
after = config.get('after_completion', ',')+" "
input_pos = self.input.pos + self.input.line_pos
if ' ' not in self.input.get_text()[:input_pos] or (self.input.last_completion and\
@@ -1586,9 +1584,6 @@ class PrivateTab(ChatTab):
compare_users = lambda x: x.last_talked
word_list = [user.nick for user in sorted(self.parent_muc.users, key=compare_users, reverse=True)\
if user.nick != self.own_nick]
- word_list.extend(config.get('words', '').split(':'))
- if '' in word_list:
- word_list.remove('')
after = config.get('after_completion', ',')+" "
input_pos = self.input.pos + self.input.line_pos
if ' ' not in self.input.get_text()[:input_pos] or (self.input.last_completion and\
@@ -2504,22 +2499,7 @@ class ConversationTab(ChatTab):
del ConversationTab.additional_informations[plugin_name]
def completion(self):
- if self.complete_commands(self.input):
- return
-
- word_list = config.get('words', '').split(':')
- if '' in word_list:
- word_list.remove('')
- after = config.get('after_completion', ',')+" "
- input_pos = self.input.pos + self.input.line_pos
- if ' ' not in self.input.get_text()[:input_pos] or (self.input.last_completion and\
- self.input.get_text()[:input_pos] == self.input.last_completion + after):
- add_after = after
- else:
- add_after = ''
- self.input.auto_completion(word_list, add_after, quotify=False)
- empty_after = self.input.get_text() == '' or (self.input.get_text().startswith('/') and not self.input.get_text().startswith('//'))
- self.send_composing_chat_state(empty_after)
+ self.complete_commands(self.input)
def command_say(self, line, attention=False):
msg = self.core.xmpp.make_message(self.get_name())