Skip to content

Commit

Permalink
fix: fix another namespace-related typo.
Browse files Browse the repository at this point in the history
  • Loading branch information
zicklag committed Mar 16, 2024
1 parent 8bf6870 commit a3b6d40
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ ENV SERVER_ORIGIN="https://matrix.notmyrealserver.com"
ENV ADMIN_INVITE=""
ENV CONTENT_LENGTH_WORKAROUND="false"
ENV NAMESPACE_PREFIX="_ooye_"
ENV SENDER_LOCALPART="_ooye_bot"
ENV URL="http://localhost:6693"
# This is the user and channel namespace used when creating user accounts or channels to mirror
# the Discord ones.
ENV NAMESPACE="_ooye_"
# These may be generated with:
# dd if=/dev/urandom bs=32 count=1 2> /dev/null | basenc --base16 | dd conv=lcase 2> /dev/null
ENV HS_TOKEN="[a unique 64 character hex string]"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ bridge, and connect that to the _same_ matrix server, you may get errors from OO
that a user ID is already taken. This is because OOYE will create users in matrix that correspond
with the Discord users, but they will have their user ID prefixed with a namespace like `_ooye_`.
If you start a new OOYE bridge and connect it to the same server, it will try to create those
corresponding users with the same ID. You can fix this by setting the `NAMESPACE` environment
corresponding users with the same ID. You can fix this by setting the `NAMESPACE_PREFIX` environment
variable in the `environment:` section of your `docker-compose.yaml`, for example:

```yaml
# ...
environment:
NAMESPACE: _ooye2_
NAMESPACE_PREFIX: _ooye2_
# ...
```

6 changes: 3 additions & 3 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ id: de8c56117637cb5d9f4ac216f612dc2adb1de4c09ae8d13553f28c33a28147c7
hs_token: ${HS_TOKEN}
as_token: ${AS_TOKEN}
url: ${URL}
sender_localpart: ${NAMESPACE}_bridge_bot
sender_localpart: ${NAMESPACE_PREFIX}_bridge_bot
protocols:
- discord
namespaces:
users:
- exclusive: true
regex: '@${NAMESPACE}.*'
regex: '@${NAMESPACE_PREFIX}.*'
aliases:
- exclusive: true
regex: '#${NAMESPACE}.*'
regex: '#${NAMESPACE_PREFIX}.*'
rate_limited: false
ooye:
namespace_prefix: ${NAMESPACE_PREFIX}
Expand Down

0 comments on commit a3b6d40

Please sign in to comment.