Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
7dac1bfc
Commit
7dac1bfc
authored
10 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Change webclient to always hit the im sync api before streaming so we get current presence state
parent
e7ee0b9f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
webclient/components/matrix/event-stream-service.js
+35
-6
35 additions, 6 deletions
webclient/components/matrix/event-stream-service.js
webclient/rooms/rooms-controller.js
+6
-1
6 additions, 1 deletion
webclient/rooms/rooms-controller.js
with
41 additions
and
7 deletions
webclient/components/matrix/event-stream-service.js
+
35
−
6
View file @
7dac1bfc
...
...
@@ -48,11 +48,12 @@ angular.module('eventStreamService', [])
var
saveStreamSettings
=
function
()
{
localStorage
.
setItem
(
"
streamSettings
"
,
JSON
.
stringify
(
settings
));
};
var
start
EventStream
=
function
()
{
var
do
EventStream
=
function
(
deferred
)
{
settings
.
shouldPoll
=
true
;
settings
.
isActive
=
true
;
var
deferred
=
$q
.
defer
();
deferred
=
deferred
||
$q
.
defer
();
// run the stream from the latest token
matrixService
.
getEventStream
(
settings
.
from
,
TIMEOUT_MS
).
then
(
function
(
response
)
{
...
...
@@ -63,13 +64,16 @@ angular.module('eventStreamService', [])
settings
.
from
=
response
.
data
.
end
;
console
.
log
(
"
[EventStream] Got response from
"
+
settings
.
from
+
"
to
"
+
response
.
data
.
end
);
console
.
log
(
"
[EventStream] Got response from
"
+
settings
.
from
+
"
to
"
+
response
.
data
.
end
);
eventHandlerService
.
handleEvents
(
response
.
data
.
chunk
,
true
);
deferred
.
resolve
(
response
);
if
(
settings
.
shouldPoll
)
{
$timeout
(
start
EventStream
,
0
);
$timeout
(
do
EventStream
,
0
);
}
else
{
console
.
log
(
"
[EventStream] Stopping poll.
"
);
...
...
@@ -83,13 +87,38 @@ angular.module('eventStreamService', [])
deferred
.
reject
(
error
);
if
(
settings
.
shouldPoll
)
{
$timeout
(
start
EventStream
,
ERR_TIMEOUT_MS
);
$timeout
(
do
EventStream
,
ERR_TIMEOUT_MS
);
}
else
{
console
.
log
(
"
[EventStream] Stopping polling.
"
);
}
}
);
return
deferred
.
promise
;
}
var
startEventStream
=
function
()
{
settings
.
shouldPoll
=
true
;
settings
.
isActive
=
true
;
var
deferred
=
$q
.
defer
();
// FIXME: We are discarding all the messages.
matrixService
.
rooms
().
then
(
function
(
response
)
{
var
presence
=
response
.
data
.
presence
;
for
(
var
i
=
0
;
i
<
presence
.
length
;
++
i
)
{
eventHandlerService
.
handleEvent
(
presence
[
i
],
false
);
}
settings
.
from
=
response
.
data
.
end
doEventStream
(
deferred
);
},
function
(
error
)
{
$scope
.
feedback
=
"
Failure:
"
+
error
.
data
;
}
);
return
deferred
.
promise
;
};
...
...
This diff is collapsed.
Click to expand it.
webclient/rooms/rooms-controller.js
+
6
−
1
View file @
7dac1bfc
...
...
@@ -93,11 +93,16 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
// List all rooms joined or been invited to
matrixService
.
rooms
().
then
(
function
(
response
)
{
var
data
=
assignRoomAliases
(
response
.
data
);
var
data
=
assignRoomAliases
(
response
.
data
.
rooms
);
$scope
.
feedback
=
"
Success
"
;
for
(
var
i
=
0
;
i
<
data
.
length
;
i
++
)
{
$scope
.
rooms
[
data
[
i
].
room_id
]
=
data
[
i
];
}
var
presence
=
response
.
data
.
presence
;
for
(
var
i
=
0
;
i
<
presence
.
length
;
++
i
)
{
eventHandlerService
.
handleEvent
(
presence
[
i
],
false
);
}
},
function
(
error
)
{
$scope
.
feedback
=
"
Failure:
"
+
error
.
data
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment