Commit a372e5f4 authored by Madhur Garg's avatar Madhur Garg

Added a call to scroll for 10 messages on initially joining the room.

parent 4818210a
......@@ -29,6 +29,7 @@ from poezio import decorators
from poezio import events
from poezio import multiuserchat as muc
from poezio import tabs
from poezio import mam
from poezio import theming
from poezio import timed_events
from poezio import windows
......@@ -1997,6 +1998,7 @@ class Core:
if not tab:
self.open_new_room(
bm.jid, nick, focus=False, password=bm.password)
tab = self.tabs.by_name_and_class(bm.jid, tabs.MucTab)
self.initial_joins.append(bm.jid)
# do not join rooms that do not have autojoin
# but display them anyway
......@@ -2008,6 +2010,7 @@ class Core:
passwd=bm.password,
status=self.status.message,
show=self.status.show)
mam.mam_scroll(tab)
def check_bookmark_storage(self, features):
private = 'jabber:iq:private' in features
......
......@@ -13,7 +13,6 @@ slix plugin
from xml.etree import cElementTree as ET
from poezio.common import safeJID
from poezio import mam
from slixmpp import JID
from slixmpp.exceptions import IqError, IqTimeout
import logging
......@@ -124,11 +123,11 @@ def join_groupchat(core,
history = ET.Element('{http://jabber.org/protocol/muc}history')
history.attrib['seconds'] = str(0)
x.append(history)
mam.mam_scroll(core.tabs.current_tab)
elif seconds is not None:
history = ET.Element('{http://jabber.org/protocol/muc}history')
history.attrib['seconds'] = str(seconds)
x.append(history)
else:
if seconds is not None:
history = ET.Element('{http://jabber.org/protocol/muc}history')
history.attrib['seconds'] = str(seconds)
x.append(history)
stanza.append(x)
core.events.trigger('joining_muc', stanza)
to = stanza["to"]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment