Merge remote-tracking branch 'origin/develop' into clokep/appservice-…

…types

synapse/appservice/__init__.py

@@ -11,8 +11,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import logging
 import re
+from enum import Enum
 from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Pattern
 
 import attr

synapse/storage/databases/main/appservice.py

@@ -132,7 +132,9 @@ class ApplicationServiceStore(ApplicationServiceWorkerStore):
 class ApplicationServiceTransactionWorkerStore(
     ApplicationServiceWorkerStore, EventsWorkerStore
 ):
-    async def get_appservices_by_state(self, state: str) -> List[ApplicationService]:
+    async def get_appservices_by_state(
+        self, state: ApplicationServiceState
+    ) -> List[ApplicationService]:
         """Get a list of application services based on their state.
 
         Args:
@@ -175,7 +177,7 @@ async def get_appservice_state(
         return None
 
     async def set_appservice_state(
-        self, service: ApplicationService, state: str
+        self, service: ApplicationService, state: ApplicationServiceState
     ) -> None:
         """Set the application service state.