Merge branch 'hs/roomstore-db' of...

Merge branch 'hs/roomstore-db' of github.com:Half-Shot/matrix-appservice-discord into hs/roomstore-db

provisioner-rules.yaml

-# This rule checks the memberlist of a room to determine if it will let
-# the bridge create a link to the room. This is useful for avoiding conflicts
-# with other bridges.
-userIds:
-    # Anyone in this set will be ALWAYS exempt from the conflicts rule.
-    # Here anyone who's localpart starts with nice is exempt.
-    exempt:
-        - "@nice+.:example.com"
-        - "@mr.e:localhost"
-    # This is a regex that will exclude anyone who has "guy" at the end of their localpart.
-    # evilbloke is also exempt.
-    conflict:
-        - "@+.guy:example.com"
-        - "@evilbloke:example.com"
-        - "@mr.*:localhost"

src/db/roomstore.ts

 /*
-Copyright 2018 matrix-appservice-discord
+Copyright 2019 matrix-appservice-discord
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

src/db/schema/v8.ts

 /*
-Copyright 2018 matrix-appservice-discord
+Copyright 2019 matrix-appservice-discord
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

test/db/test_roomstore.ts

 /*
-Copyright 2017, 2018 matrix-appservice-discord
+Copyright 2019 matrix-appservice-discord
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.