mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-16 04:13:51 +01:00
Remove content from being sent for account data rdata stream
This commit is contained in:
parent
963ffb60b9
commit
c4bdf2d785
2 changed files with 6 additions and 6 deletions
|
@ -89,7 +89,7 @@ TagAccountDataStreamRow = namedtuple(
|
||||||
)
|
)
|
||||||
AccountDataStreamRow = namedtuple(
|
AccountDataStreamRow = namedtuple(
|
||||||
"AccountDataStream",
|
"AccountDataStream",
|
||||||
("user_id", "room_id", "data_type", "data"), # str # str # str # dict
|
("user_id", "room_id", "data_type"), # str # str # str
|
||||||
)
|
)
|
||||||
GroupsStreamRow = namedtuple(
|
GroupsStreamRow = namedtuple(
|
||||||
"GroupsStreamRow",
|
"GroupsStreamRow",
|
||||||
|
@ -421,8 +421,8 @@ class AccountDataStream(Stream):
|
||||||
|
|
||||||
results = list(room_results)
|
results = list(room_results)
|
||||||
results.extend(
|
results.extend(
|
||||||
(stream_id, user_id, None, account_data_type, content)
|
(stream_id, user_id, None, account_data_type)
|
||||||
for stream_id, user_id, account_data_type, content in global_results
|
for stream_id, user_id, account_data_type in global_results
|
||||||
)
|
)
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|
|
@ -184,14 +184,14 @@ class AccountDataWorkerStore(SQLBaseStore):
|
||||||
current_id(int): The position to fetch up to.
|
current_id(int): The position to fetch up to.
|
||||||
Returns:
|
Returns:
|
||||||
A deferred pair of lists of tuples of stream_id int, user_id string,
|
A deferred pair of lists of tuples of stream_id int, user_id string,
|
||||||
room_id string, type string, and content string.
|
room_id string, and type string.
|
||||||
"""
|
"""
|
||||||
if last_room_id == current_id and last_global_id == current_id:
|
if last_room_id == current_id and last_global_id == current_id:
|
||||||
return defer.succeed(([], []))
|
return defer.succeed(([], []))
|
||||||
|
|
||||||
def get_updated_account_data_txn(txn):
|
def get_updated_account_data_txn(txn):
|
||||||
sql = (
|
sql = (
|
||||||
"SELECT stream_id, user_id, account_data_type, content"
|
"SELECT stream_id, user_id, account_data_type"
|
||||||
" FROM account_data WHERE ? < stream_id AND stream_id <= ?"
|
" FROM account_data WHERE ? < stream_id AND stream_id <= ?"
|
||||||
" ORDER BY stream_id ASC LIMIT ?"
|
" ORDER BY stream_id ASC LIMIT ?"
|
||||||
)
|
)
|
||||||
|
@ -199,7 +199,7 @@ class AccountDataWorkerStore(SQLBaseStore):
|
||||||
global_results = txn.fetchall()
|
global_results = txn.fetchall()
|
||||||
|
|
||||||
sql = (
|
sql = (
|
||||||
"SELECT stream_id, user_id, room_id, account_data_type, content"
|
"SELECT stream_id, user_id, room_id, account_data_type"
|
||||||
" FROM room_account_data WHERE ? < stream_id AND stream_id <= ?"
|
" FROM room_account_data WHERE ? < stream_id AND stream_id <= ?"
|
||||||
" ORDER BY stream_id ASC LIMIT ?"
|
" ORDER BY stream_id ASC LIMIT ?"
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue