Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
matrix-react-sdk
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Matrix.org
matrix-react-sdk
Commits
b3fc191d
Commit
b3fc191d
authored
1 year ago
by
David Langley
Browse files
Options
Downloads
Patches
Plain Diff
Fix typos
parent
7234528b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/services/rooms/memberlist/MemberService.ts
+21
-21
21 additions, 21 deletions
src/services/rooms/memberlist/MemberService.ts
src/view-models/rooms/memberlist/MemberListViewModel.ts
+1
-1
1 addition, 1 deletion
src/view-models/rooms/memberlist/MemberListViewModel.ts
with
22 additions
and
22 deletions
src/services/rooms/memberlist/MemberSerice.ts
→
src/services/rooms/memberlist/MemberSer
v
ice.ts
+
21
−
21
View file @
b3fc191d
...
...
@@ -44,15 +44,15 @@ import { PresenceState } from "../../../models/rooms/PresenceState";
export
class
MemberService
implements
IMemberService
{
private
roomId
:
string
;
private
matixClient
:
MatrixClient
;
private
mat
r
ixClient
:
MatrixClient
;
private
memberListStore
:
MemberListStore
;
private
membershipType
?:
string
;
private
onMemberListUpdated
?:
(
reload
:
boolean
)
=>
void
;
private
onPresenceUpdated
?:
(
userId
:
string
)
=>
void
;
public
constructor
(
roomId
:
string
,
matixClient
:
MatrixClient
,
memberListStore
:
MemberListStore
)
{
public
constructor
(
roomId
:
string
,
mat
r
ixClient
:
MatrixClient
,
memberListStore
:
MemberListStore
)
{
this
.
roomId
=
roomId
;
this
.
matixClient
=
matixClient
;
this
.
mat
r
ixClient
=
mat
r
ixClient
;
this
.
memberListStore
=
memberListStore
;
}
...
...
@@ -65,25 +65,25 @@ export class MemberService implements IMemberService {
}
public
load
():
void
{
this
.
matixClient
.
on
(
RoomStateEvent
.
Update
,
this
.
onRoomStateUpdate
);
this
.
matixClient
.
on
(
RoomMemberEvent
.
Name
,
this
.
onRoomMemberName
);
this
.
matixClient
.
on
(
RoomStateEvent
.
Events
,
this
.
onRoomStateEvent
);
this
.
matixClient
.
on
(
ClientEvent
.
Room
,
this
.
onRoom
);
// invites & joining after peek
this
.
matixClient
.
on
(
RoomEvent
.
MyMembership
,
this
.
onMyMembership
);
this
.
matixClient
.
on
(
UserEvent
.
LastPresenceTs
,
this
.
onUserPresenceChange
);
this
.
matixClient
.
on
(
UserEvent
.
Presence
,
this
.
onUserPresenceChange
);
this
.
matixClient
.
on
(
UserEvent
.
CurrentlyActive
,
this
.
onUserPresenceChange
);
this
.
mat
r
ixClient
.
on
(
RoomStateEvent
.
Update
,
this
.
onRoomStateUpdate
);
this
.
mat
r
ixClient
.
on
(
RoomMemberEvent
.
Name
,
this
.
onRoomMemberName
);
this
.
mat
r
ixClient
.
on
(
RoomStateEvent
.
Events
,
this
.
onRoomStateEvent
);
this
.
mat
r
ixClient
.
on
(
ClientEvent
.
Room
,
this
.
onRoom
);
// invites & joining after peek
this
.
mat
r
ixClient
.
on
(
RoomEvent
.
MyMembership
,
this
.
onMyMembership
);
this
.
mat
r
ixClient
.
on
(
UserEvent
.
LastPresenceTs
,
this
.
onUserPresenceChange
);
this
.
mat
r
ixClient
.
on
(
UserEvent
.
Presence
,
this
.
onUserPresenceChange
);
this
.
mat
r
ixClient
.
on
(
UserEvent
.
CurrentlyActive
,
this
.
onUserPresenceChange
);
}
public
unload
():
void
{
this
.
matixClient
.
off
(
RoomStateEvent
.
Update
,
this
.
onRoomStateUpdate
);
this
.
matixClient
.
off
(
RoomMemberEvent
.
Name
,
this
.
onRoomMemberName
);
this
.
matixClient
.
off
(
RoomStateEvent
.
Events
,
this
.
onRoomStateEvent
);
this
.
matixClient
.
off
(
ClientEvent
.
Room
,
this
.
onRoom
);
this
.
matixClient
.
off
(
RoomEvent
.
MyMembership
,
this
.
onMyMembership
);
this
.
matixClient
.
off
(
UserEvent
.
LastPresenceTs
,
this
.
onUserPresenceChange
);
this
.
matixClient
.
off
(
UserEvent
.
Presence
,
this
.
onUserPresenceChange
);
this
.
matixClient
.
off
(
UserEvent
.
CurrentlyActive
,
this
.
onUserPresenceChange
);
this
.
mat
r
ixClient
.
off
(
RoomStateEvent
.
Update
,
this
.
onRoomStateUpdate
);
this
.
mat
r
ixClient
.
off
(
RoomMemberEvent
.
Name
,
this
.
onRoomMemberName
);
this
.
mat
r
ixClient
.
off
(
RoomStateEvent
.
Events
,
this
.
onRoomStateEvent
);
this
.
mat
r
ixClient
.
off
(
ClientEvent
.
Room
,
this
.
onRoom
);
this
.
mat
r
ixClient
.
off
(
RoomEvent
.
MyMembership
,
this
.
onMyMembership
);
this
.
mat
r
ixClient
.
off
(
UserEvent
.
LastPresenceTs
,
this
.
onUserPresenceChange
);
this
.
mat
r
ixClient
.
off
(
UserEvent
.
Presence
,
this
.
onUserPresenceChange
);
this
.
mat
r
ixClient
.
off
(
UserEvent
.
CurrentlyActive
,
this
.
onUserPresenceChange
);
}
public
async
loadMembers
(
searchQuery
?:
string
):
Promise
<
Record
<
"
joined
"
|
"
invited
"
,
RoomMember
[]
>>
{
...
...
@@ -182,7 +182,7 @@ export class MemberService implements IMemberService {
// The HS may have already converted these into m.room.member invites so
// we shouldn't add them if the 3pid invite state key (token) is in the
// member invite (content.third_party_invite.signed.token)
const
room
=
this
.
matixClient
.
getRoom
(
this
.
roomId
);
const
room
=
this
.
mat
r
ixClient
.
getRoom
(
this
.
roomId
);
if
(
room
)
{
return
room
.
currentState
...
...
@@ -214,7 +214,7 @@ export class MemberService implements IMemberService {
}
public
shouldShowInvite
():
boolean
{
const
room
=
this
.
matixClient
.
getRoom
(
this
.
roomId
);
const
room
=
this
.
mat
r
ixClient
.
getRoom
(
this
.
roomId
);
return
room
?.
getMyMembership
()
==
KnownMembership
.
Join
&&
shouldShowComponent
(
UIComponent
.
InviteUsers
);
}
...
...
This diff is collapsed.
Click to expand it.
src/view-models/rooms/memberlist/MemberListViewModel.ts
+
1
−
1
View file @
b3fc191d
...
...
@@ -24,7 +24,7 @@ import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
import
{
SDKContext
}
from
"
../../../contexts/SDKContext
"
;
import
{
useEventEmitterState
}
from
"
../../../hooks/useEventEmitter
"
;
import
{
canInviteTo
}
from
"
../../../utils/room/canInviteTo
"
;
import
{
MemberService
}
from
"
../../../services/rooms/memberlist/MemberSerice
"
;
import
{
MemberService
}
from
"
../../../services/rooms/memberlist/MemberSer
v
ice
"
;
import
{
RoomMember
}
from
"
../../../models/rooms/RoomMember
"
;
import
{
ThreePIDInvite
}
from
"
../../../models/rooms/ThreePIDInvite
"
;
...
...
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