Merge branch 'master' of https://git.dodsorf.as/Dandellion/matrix-wug

README.md

@@ -1,5 +1,5 @@
 # About
-This is a bot for converting x- or z-sampa to IPA, or converting a custom ascii notation to standard PIE notation.
+This is a bot for converting x- or z-sampa to IPA, or converting a custom ascii notation to standard PIE notation. Useful for e.g. linguistics and conlanging, and for creating powerful unicode emoticons.
 
 Simply type your ascii inside // or [] with a prefixed x, z or p for x-sampa, z-sampa and PIE-notation respectively.  
 For instance:  

index.ts

@@ -1,11 +1,14 @@
 import x2i from "./x2i";
 
-const config = require("./config.json");
+// const config = require("./config.json");
 
 const MatrixClient = require("matrix-bot-sdk").MatrixClient;
 const AutojoinRoomsMixin = require("matrix-bot-sdk").AutojoinRoomsMixin;
 
-const client = new MatrixClient(config.homeserver, config.token);
+const homeserver = ( /*config.homeserver || process.env.WUG_HOMESERVER ||*/ process.env.MATRIXDEV_HOMESERVER);
+const token = (/* config.token || process.env.WUG_TOKEN||*/ process.env.MATRIXDEV_TOKEN);
+
+const client = new MatrixClient(homeserver, token);
 AutojoinRoomsMixin.setupOnClient(client);
 
 const myself = client.getUserId()

x2i/z2i-keys.yaml

@@ -286,7 +286,7 @@
 - - _/
   - ̌
 - - _;
-  - 
+  - ͋
 - - _=\
   - "˭"
 - - _=