mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-23 10:45:48 +00:00
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
This commit is contained in:
commit
d61109f578
31
README.rst
31
README.rst
@ -133,6 +133,37 @@ failing, e.g.::
|
|||||||
On OSX, if you encounter clang: error: unknown argument: '-mno-fused-madd' you
|
On OSX, if you encounter clang: error: unknown argument: '-mno-fused-madd' you
|
||||||
will need to export CFLAGS=-Qunused-arguments.
|
will need to export CFLAGS=-Qunused-arguments.
|
||||||
|
|
||||||
|
Windows Install
|
||||||
|
---------------
|
||||||
|
Synapse can be installed on Cygwin. It requires the following Cygwin packages:
|
||||||
|
|
||||||
|
- gcc
|
||||||
|
- git
|
||||||
|
- libffi-devel
|
||||||
|
- openssl (and openssl-devel, python-openssl)
|
||||||
|
- python
|
||||||
|
- python-setuptools
|
||||||
|
|
||||||
|
The content repository requires additional packages and will be unable to process
|
||||||
|
uploads without them:
|
||||||
|
- libjpeg8
|
||||||
|
- libjpeg8-devel
|
||||||
|
- zlib
|
||||||
|
If you choose to install Synapse without these packages, you will need to reinstall
|
||||||
|
``pillow`` for changes to be applied, e.g. ``pip uninstall pillow`` ``pip install
|
||||||
|
pillow --user``
|
||||||
|
|
||||||
|
Troubleshooting:
|
||||||
|
|
||||||
|
- You may need to upgrade ``setuptools`` to get this to work correctly:
|
||||||
|
``pip install setuptools --upgrade``.
|
||||||
|
- You may encounter errors indicating that ``ffi.h`` is missing, even with
|
||||||
|
``libffi-devel`` installed. If you do, copy the ``.h`` files:
|
||||||
|
``cp /usr/lib/libffi-3.0.13/include/*.h /usr/include``
|
||||||
|
- You may need to install libsodium from source in order to install PyNacl. If
|
||||||
|
you do, you may need to create a symlink to ``libsodium.a`` so ``ld`` can find
|
||||||
|
it: ``ln -s /usr/local/lib/libsodium.a /usr/lib/libsodium.a``
|
||||||
|
|
||||||
Running Your Homeserver
|
Running Your Homeserver
|
||||||
=======================
|
=======================
|
||||||
|
|
||||||
|
4
setup.py
4
setup.py
@ -32,7 +32,7 @@ setup(
|
|||||||
description="Reference Synapse Home Server",
|
description="Reference Synapse Home Server",
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"syutil==0.0.2",
|
"syutil==0.0.2",
|
||||||
"matrix_angular_sdk==0.5.3b",
|
"matrix_angular_sdk==0.6.0",
|
||||||
"Twisted>=14.0.0",
|
"Twisted>=14.0.0",
|
||||||
"service_identity>=1.0.0",
|
"service_identity>=1.0.0",
|
||||||
"pyopenssl>=0.14",
|
"pyopenssl>=0.14",
|
||||||
@ -47,7 +47,7 @@ setup(
|
|||||||
dependency_links=[
|
dependency_links=[
|
||||||
"https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2",
|
"https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2",
|
||||||
"https://github.com/pyca/pynacl/tarball/d4d3175589b892f6ea7c22f466e0e223853516fa#egg=pynacl-0.3.0",
|
"https://github.com/pyca/pynacl/tarball/d4d3175589b892f6ea7c22f466e0e223853516fa#egg=pynacl-0.3.0",
|
||||||
"https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.5.3b/#egg=matrix_angular_sdk-0.5.3b",
|
"https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.0/#egg=matrix_angular_sdk-0.6.0",
|
||||||
],
|
],
|
||||||
setup_requires=[
|
setup_requires=[
|
||||||
"setuptools_trial",
|
"setuptools_trial",
|
||||||
|
@ -126,5 +126,8 @@ def serialize_event(hs, e):
|
|||||||
del d["prev_events"]
|
del d["prev_events"]
|
||||||
del d["hashes"]
|
del d["hashes"]
|
||||||
del d["signatures"]
|
del d["signatures"]
|
||||||
|
d.pop("depth", None)
|
||||||
|
d.pop("unsigned", None)
|
||||||
|
d.pop("origin", None)
|
||||||
|
|
||||||
return d
|
return d
|
||||||
|
@ -155,4 +155,4 @@ class DirectoryHandler(BaseHandler):
|
|||||||
"room_id": room_id,
|
"room_id": room_id,
|
||||||
"sender": user_id,
|
"sender": user_id,
|
||||||
"content": {"aliases": aliases},
|
"content": {"aliases": aliases},
|
||||||
})
|
}, ratelimit=False)
|
||||||
|
@ -19,6 +19,7 @@ from synapse.api.constants import EventTypes, Membership
|
|||||||
from synapse.api.errors import RoomError
|
from synapse.api.errors import RoomError
|
||||||
from synapse.streams.config import PaginationConfig
|
from synapse.streams.config import PaginationConfig
|
||||||
from synapse.events.validator import EventValidator
|
from synapse.events.validator import EventValidator
|
||||||
|
from synapse.util.logcontext import PreserveLoggingContext
|
||||||
|
|
||||||
from ._base import BaseHandler
|
from ._base import BaseHandler
|
||||||
|
|
||||||
@ -106,7 +107,7 @@ class MessageHandler(BaseHandler):
|
|||||||
defer.returnValue(chunk)
|
defer.returnValue(chunk)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def create_and_send_event(self, event_dict):
|
def create_and_send_event(self, event_dict, ratelimit=True):
|
||||||
""" Given a dict from a client, create and handle a new event.
|
""" Given a dict from a client, create and handle a new event.
|
||||||
|
|
||||||
Creates an FrozenEvent object, filling out auth_events, prev_events,
|
Creates an FrozenEvent object, filling out auth_events, prev_events,
|
||||||
@ -123,7 +124,8 @@ class MessageHandler(BaseHandler):
|
|||||||
|
|
||||||
self.validator.validate_new(builder)
|
self.validator.validate_new(builder)
|
||||||
|
|
||||||
self.ratelimit(builder.user_id)
|
if ratelimit:
|
||||||
|
self.ratelimit(builder.user_id)
|
||||||
# TODO(paul): Why does 'event' not have a 'user' object?
|
# TODO(paul): Why does 'event' not have a 'user' object?
|
||||||
user = self.hs.parse_userid(builder.user_id)
|
user = self.hs.parse_userid(builder.user_id)
|
||||||
assert self.hs.is_mine(user), "User must be our own: %s" % (user,)
|
assert self.hs.is_mine(user), "User must be our own: %s" % (user,)
|
||||||
@ -152,6 +154,11 @@ class MessageHandler(BaseHandler):
|
|||||||
context=context,
|
context=context,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if event.type == EventTypes.Message:
|
||||||
|
presence = self.hs.get_handlers().presence_handler
|
||||||
|
with PreserveLoggingContext():
|
||||||
|
presence.bump_presence_active_time(user)
|
||||||
|
|
||||||
defer.returnValue(event)
|
defer.returnValue(event)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
|
@ -130,6 +130,7 @@ class RoomCreationHandler(BaseHandler):
|
|||||||
"type": EventTypes.Name,
|
"type": EventTypes.Name,
|
||||||
"room_id": room_id,
|
"room_id": room_id,
|
||||||
"sender": user_id,
|
"sender": user_id,
|
||||||
|
"state_key": "",
|
||||||
"content": {"name": name},
|
"content": {"name": name},
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -139,6 +140,7 @@ class RoomCreationHandler(BaseHandler):
|
|||||||
"type": EventTypes.Topic,
|
"type": EventTypes.Topic,
|
||||||
"room_id": room_id,
|
"room_id": room_id,
|
||||||
"sender": user_id,
|
"sender": user_id,
|
||||||
|
"state_key": "",
|
||||||
"content": {"topic": topic},
|
"content": {"topic": topic},
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -147,7 +149,7 @@ class RoomCreationHandler(BaseHandler):
|
|||||||
"type": EventTypes.Member,
|
"type": EventTypes.Member,
|
||||||
"state_key": invitee,
|
"state_key": invitee,
|
||||||
"room_id": room_id,
|
"room_id": room_id,
|
||||||
"user_id": user_id,
|
"sender": user_id,
|
||||||
"content": {"membership": Membership.INVITE},
|
"content": {"membership": Membership.INVITE},
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -390,6 +392,11 @@ class RoomMemberHandler(BaseHandler):
|
|||||||
|
|
||||||
host = hosts[0]
|
host = hosts[0]
|
||||||
|
|
||||||
|
# If event doesn't include a display name, add one.
|
||||||
|
yield self.distributor.fire(
|
||||||
|
"collect_presencelike_data", joinee, content
|
||||||
|
)
|
||||||
|
|
||||||
content.update({"membership": Membership.JOIN})
|
content.update({"membership": Membership.JOIN})
|
||||||
builder = self.event_builder_factory.new({
|
builder = self.event_builder_factory.new({
|
||||||
"type": EventTypes.Member,
|
"type": EventTypes.Member,
|
||||||
|
@ -165,18 +165,27 @@ class ThumbnailResource(BaseMediaResource):
|
|||||||
aspect_quality, size_quality, type_quality,
|
aspect_quality, size_quality, type_quality,
|
||||||
length_quality, info
|
length_quality, info
|
||||||
))
|
))
|
||||||
return min(info_list)[-1]
|
if info_list:
|
||||||
|
return min(info_list)[-1]
|
||||||
else:
|
else:
|
||||||
info_list = []
|
info_list = []
|
||||||
|
info_list2 = []
|
||||||
for info in thumbnail_infos:
|
for info in thumbnail_infos:
|
||||||
t_w = info["thumbnail_width"]
|
t_w = info["thumbnail_width"]
|
||||||
t_h = info["thumbnail_height"]
|
t_h = info["thumbnail_height"]
|
||||||
t_method = info["thumbnail_method"]
|
t_method = info["thumbnail_method"]
|
||||||
|
size_quality = abs((d_w - t_w) * (d_h - t_h))
|
||||||
|
type_quality = desired_type != info["thumbnail_type"]
|
||||||
|
length_quality = info["thumbnail_length"]
|
||||||
if t_method == "scale" and (t_w >= d_w or t_h >= d_h):
|
if t_method == "scale" and (t_w >= d_w or t_h >= d_h):
|
||||||
size_quality = abs((d_w - t_w) * (d_h - t_h))
|
|
||||||
type_quality = desired_type != info["thumbnail_type"]
|
|
||||||
length_quality = info["thumbnail_length"]
|
|
||||||
info_list.append((
|
info_list.append((
|
||||||
size_quality, type_quality, length_quality, info
|
size_quality, type_quality, length_quality, info
|
||||||
))
|
))
|
||||||
return min(info_list)[-1]
|
elif t_method == "scale":
|
||||||
|
info_list2.append((
|
||||||
|
size_quality, type_quality, length_quality, info
|
||||||
|
))
|
||||||
|
if info_list:
|
||||||
|
return min(info_list)[-1]
|
||||||
|
else:
|
||||||
|
return min(info_list2)[-1]
|
||||||
|
@ -135,26 +135,26 @@ class RoomStore(SQLBaseStore):
|
|||||||
defer.returnValue(ret)
|
defer.returnValue(ret)
|
||||||
|
|
||||||
def _store_room_topic_txn(self, txn, event):
|
def _store_room_topic_txn(self, txn, event):
|
||||||
if hasattr(event, "topic"):
|
if hasattr(event, "content") and "topic" in event.content:
|
||||||
self._simple_insert_txn(
|
self._simple_insert_txn(
|
||||||
txn,
|
txn,
|
||||||
"topics",
|
"topics",
|
||||||
{
|
{
|
||||||
"event_id": event.event_id,
|
"event_id": event.event_id,
|
||||||
"room_id": event.room_id,
|
"room_id": event.room_id,
|
||||||
"topic": event.topic,
|
"topic": event.content["topic"],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
def _store_room_name_txn(self, txn, event):
|
def _store_room_name_txn(self, txn, event):
|
||||||
if hasattr(event, "name"):
|
if hasattr(event, "content") and "name" in event.content:
|
||||||
self._simple_insert_txn(
|
self._simple_insert_txn(
|
||||||
txn,
|
txn,
|
||||||
"room_names",
|
"room_names",
|
||||||
{
|
{
|
||||||
"event_id": event.event_id,
|
"event_id": event.event_id,
|
||||||
"room_id": event.room_id,
|
"room_id": event.room_id,
|
||||||
"name": event.name,
|
"name": event.content["name"],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user