Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
poezio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
175
Issues
175
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
poezio
poezio
Commits
dfec8bdf
Commit
dfec8bdf
authored
Aug 07, 2019
by
Madhur Garg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aligned the timestamp of MAM start/end messages, added info message if no more messages are left.
parent
a7530dc3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
13 deletions
+14
-13
poezio/mam.py
poezio/mam.py
+14
-13
No files found.
poezio/mam.py
View file @
dfec8bdf
...
...
@@ -18,14 +18,14 @@ def add_line(self, text_buffer: TextBuffer, text: str, str_time: str, nick: str,
time
=
datetime
.
strftime
(
str_time
,
'%Y-%m-%d %H:%M:%S'
)
time
=
datetime
.
strptime
(
time
,
'%Y-%m-%d %H:%M:%S'
)
time
=
time
.
replace
(
tzinfo
=
timezone
.
utc
).
astimezone
(
tz
=
None
)
time
=
time
.
replace
(
tzinfo
=
None
)
if
'/'
in
nick
:
if
isinstance
(
self
,
tabs
.
MucTab
):
nick
=
nick
.
split
(
'/'
)[
1
]
else
:
nick
=
nick
.
split
(
'/'
)[
0
]
color
=
get_theme
().
COLOR_OWN_NICK
time
=
time
.
replace
(
tzinfo
=
timezone
.
utc
).
astimezone
(
tz
=
None
)
time
=
time
.
replace
(
tzinfo
=
None
)
else
:
color
=
get_theme
().
COLOR_ME_MESSAGE
text_buffer
.
add_message
(
...
...
@@ -59,30 +59,28 @@ async def query(self, remote_jid, start, end, top):
results
=
self
.
core
.
xmpp
[
'xep_0313'
].
retrieve
(
jid
=
self
.
remote_jid
,
iterator
=
True
,
reverse
=
top
,
end
=
self
.
end_date
)
except
(
IqError
,
IqTimeout
):
return
self
.
information
(
'Failed to retrieve messages'
,
'Error'
)
return
self
.
core
.
information
(
'Failed to retrieve messages'
,
'Error'
)
else
:
try
:
results
=
self
.
core
.
xmpp
[
'xep_0313'
].
retrieve
(
with_jid
=
self
.
remote_jid
,
iterator
=
True
,
reverse
=
top
,
end
=
self
.
end_date
)
except
(
IqError
,
IqTimeout
):
return
self
.
information
(
'Failed to retrieve messages'
,
'Error'
)
return
self
.
core
.
information
(
'Failed to retrieve messages'
,
'Error'
)
else
:
if
isinstance
(
self
,
tabs
.
MucTab
):
try
:
results
=
self
.
core
.
xmpp
[
'xep_0313'
].
retrieve
(
jid
=
self
.
remote_jid
,
iterator
=
True
,
reverse
=
top
,
start
=
self
.
start_date
,
end
=
self
.
end_date
)
except
(
IqError
,
IqTimeout
):
return
self
.
information
(
'Failed to retrieve messages'
,
'Error'
)
return
self
.
core
.
information
(
'Failed to retrieve messages'
,
'Error'
)
else
:
try
:
results
=
self
.
core
.
xmpp
[
'xep_0313'
].
retrieve
(
with_jid
=
self
.
remote_jid
,
iterator
=
True
,
reverse
=
top
,
start
=
self
.
start_date
,
end
=
self
.
end_date
)
except
(
IqError
,
IqTimeout
):
return
self
.
information
(
'Failed to retrieve messages'
,
'Error'
)
return
self
.
core
.
information
(
'Failed to retrieve messages'
,
'Error'
)
msg_count
=
0
msgs
=
[]
timestamp
=
datetime
.
now
()
add_line
(
self
,
text_buffer
,
'Start of MAM query: '
,
timestamp
,
'MAM'
,
top
)
async
for
rsm
in
results
:
if
top
:
for
msg
in
rsm
[
'mam'
][
'results'
]:
...
...
@@ -90,17 +88,21 @@ async def query(self, remote_jid, start, end, top):
msgs
.
append
(
msg
)
if
msg_count
==
10
:
self
.
query_id
=
0
timestamp
=
datetime
.
now
()
add_line
(
self
,
text_buffer
,
'End of MAM query: '
,
timestamp
,
'MAM'
,
top
)
self
.
core
.
refresh_window
()
return
msg_count
+=
1
msgs
.
reverse
()
for
msg
in
msgs
:
if
msg
is
msgs
[
0
]:
timestamp
=
msg
[
'mam_result'
][
'forwarded'
][
'delay'
][
'stamp'
]
add_line
(
self
,
text_buffer
,
'Start of MAM query: '
,
timestamp
,
'MAM'
,
top
)
forwarded
=
msg
[
'mam_result'
][
'forwarded'
]
timestamp
=
forwarded
[
'delay'
][
'stamp'
]
message
=
forwarded
[
'stanza'
]
add_line
(
self
,
text_buffer
,
message
[
'body'
],
timestamp
,
str
(
message
[
'from'
]),
top
)
if
msg
is
msgs
[
len
(
msgs
)
-
1
]:
timestamp
=
msg
[
'mam_result'
][
'forwarded'
][
'delay'
][
'stamp'
]
add_line
(
self
,
text_buffer
,
'End of MAM query: '
,
timestamp
,
'MAM'
,
top
)
self
.
text_win
.
scroll_up
(
len
(
self
.
text_win
.
built_lines
))
else
:
for
msg
in
rsm
[
'mam'
][
'results'
]:
...
...
@@ -109,10 +111,9 @@ async def query(self, remote_jid, start, end, top):
message
=
forwarded
[
'stanza'
]
add_line
(
self
,
text_buffer
,
message
[
'body'
],
timestamp
,
str
(
message
[
'from'
]),
top
)
self
.
core
.
refresh_window
()
if
len
(
msgs
)
==
0
:
return
self
.
core
.
information
(
'No more messages left to retrieve'
,
'Info'
)
self
.
query_id
=
0
timestamp
=
datetime
.
now
()
add_line
(
self
,
text_buffer
,
'End of MAM query: '
,
timestamp
,
'MAM'
,
top
)
def
mam_scroll
(
self
):
remote_jid
=
self
.
jid
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment