From ae730f5b85be7d563e6f8e9a05fc037720f5a9ae Mon Sep 17 00:00:00 2001 From: Isaiah Abiodun <38655623+abisalde@users.noreply.github.com> Date: Mon, 18 Oct 2021 17:47:23 -0400 Subject: [PATCH 1/4] Delete Index.ejs --- dmspa/src/index copy.ejs | 102 --------------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 dmspa/src/index copy.ejs diff --git a/dmspa/src/index copy.ejs b/dmspa/src/index copy.ejs deleted file mode 100644 index 879287ec7..000000000 --- a/dmspa/src/index copy.ejs +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - Zuri DM Plugin - - - - - - - - - - - - - - - - - - <% if (isLocal) { %> - - - <% } %> - - - - - - <% if (isLocal) { %> - - - <% } else { %> - - - <% } %> - - - - -
- - - - From b023d50539efe5431471824533b9be2194965075 Mon Sep 17 00:00:00 2001 From: Isaiah Abiodun <38655623+abisalde@users.noreply.github.com> Date: Mon, 18 Oct 2021 17:48:32 -0400 Subject: [PATCH 2/4] Update index.ejs --- dmspa/src/index.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dmspa/src/index.ejs b/dmspa/src/index.ejs index 52d01dbf8..46a19cd38 100644 --- a/dmspa/src/index.ejs +++ b/dmspa/src/index.ejs @@ -36,8 +36,8 @@ { "imports": { "single-spa": "https://cdn.jsdelivr.net/npm/single-spa@5.9.0/lib/system/single-spa.min.js", - "@zuri/zuri-plugin-dm": "//localhost:8080/zuri-zuri-plugin-dm.js", - "@zuri/root-config": "//localhost:9000/zuri-root-config.js", + "@zuri/zuri-plugin-dm": "//dm.zuri.chat/static/zuri-zuri-plugin-dm.js", + "@zuri/root-config": "//dm.zuri.chat/static/zuri-root-config.js", "@zuri/utilities": "https://zuri.chat/zuri-utilities.js", "react": "https://cdn.jsdelivr.net/npm/react@16.13.1/umd/react.production.min.js", "react-dom": "https://cdn.jsdelivr.net/npm/react-dom@16.13.1/umd/react-dom.production.min.js", From 291a22f66c26cb3f13f937f6322333f0418a729c Mon Sep 17 00:00:00 2001 From: paisoncodes Date: Thu, 28 Oct 2021 15:40:28 +0100 Subject: [PATCH 3/4] Added complete docstring and comments to 'delete message' function --- .gitignore | 3 +- Pipfile | 5 +- Pipfile.lock | 110 ++++++++++++++++++++------------------- backend/messaging.py | 34 +++++++++++- zc_plugin_dm/settings.py | 2 +- 5 files changed, 93 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index b1df70872..887de7c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,7 @@ database.sqlite *.idea -*Pipfile.lock -Pipfile.lock +Pipfile* # *media *.DS_Store /.vscode diff --git a/Pipfile b/Pipfile index 7a33b9ffb..a9acbe621 100644 --- a/Pipfile +++ b/Pipfile @@ -19,15 +19,12 @@ idna = "==3.2" requests = "==2.26.0" urllib3 = "==1.26.6" drf-yasg = "==1.20.0" -django = "==3.2.6" djangorestframework-simplejwt = "==4.8.0" -apscheduler = "==3.8.0" coreapi = "==2.3.3" coreschema = "==0.0.4" coverage = "==6.0.1" inflection = "==0.5.1" itypes = "==1.2.0" -jinja2 = "==3.0.1" pyparsing = "==2.4.7" "ruamel.yaml" = "==0.17.16" "ruamel.yaml.clib" = "==0.2.6" @@ -36,6 +33,8 @@ tzlocal = "==2.1" uritemplate = "==3.0.1" MarkupSafe = "==2.0.1" PyJWT = "==2.1.0" +APScheduler = "==3.8.0" +Jinja2 = "==3.0.1" [dev-packages] black = "*" diff --git a/Pipfile.lock b/Pipfile.lock index affc121e4..a366023a2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "0ea07c9ce404dac7d3b3e8977e92552c2d31de71f3690e1ceeddcca240046bf1" + "sha256": "e014376ee80f57be877881711aac7b6b293cc4104c379be602a824d98d847d31" }, "pipfile-spec": 6, "requires": { @@ -196,6 +196,7 @@ "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298", "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64", "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b", + "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194", "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567", "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff", "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724", @@ -203,6 +204,7 @@ "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646", "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35", "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6", + "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a", "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6", "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad", "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26", @@ -210,27 +212,36 @@ "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac", "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7", "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6", + "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047", "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75", "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f", + "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b", "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135", "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8", "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a", "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a", + "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1", "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9", "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864", "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914", + "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee", + "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f", "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18", "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8", "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2", "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d", "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b", "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b", + "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86", + "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6", "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f", "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb", "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833", "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28", + "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e", "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415", "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902", + "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f", "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d", "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9", "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d", @@ -238,10 +249,14 @@ "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066", "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c", "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1", + "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a", + "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207", "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f", "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53", + "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd", "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134", "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85", + "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9", "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5", "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94", "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509", @@ -424,63 +439,52 @@ }, "regex": { "hashes": [ - "sha256:094a905e87a4171508c2a0e10217795f83c636ccc05ddf86e7272c26e14056ae", - "sha256:09e1031e2059abd91177c302da392a7b6859ceda038be9e015b522a182c89e4f", - "sha256:176796cb7f82a7098b0c436d6daac82f57b9101bb17b8e8119c36eecf06a60a3", - "sha256:19b8f6d23b2dc93e8e1e7e288d3010e58fafed323474cf7f27ab9451635136d9", - "sha256:1abbd95cbe9e2467cac65c77b6abd9223df717c7ae91a628502de67c73bf6838", - "sha256:1ce02f420a7ec3b2480fe6746d756530f69769292eca363218c2291d0b116a01", - "sha256:1f51926db492440e66c89cd2be042f2396cf91e5b05383acd7372b8cb7da373f", - "sha256:26895d7c9bbda5c52b3635ce5991caa90fbb1ddfac9c9ff1c7ce505e2282fb2a", - "sha256:2efd47704bbb016136fe34dfb74c805b1ef5c7313aef3ce6dcb5ff844299f432", - "sha256:36c98b013273e9da5790ff6002ab326e3f81072b4616fd95f06c8fa733d2745f", - "sha256:39079ebf54156be6e6902f5c70c078f453350616cfe7bfd2dd15bdb3eac20ccc", - "sha256:3d52c5e089edbdb6083391faffbe70329b804652a53c2fdca3533e99ab0580d9", - "sha256:45cb0f7ff782ef51bc79e227a87e4e8f24bc68192f8de4f18aae60b1d60bc152", - "sha256:4786dae85c1f0624ac77cb3813ed99267c9adb72e59fdc7297e1cf4d6036d493", - "sha256:51feefd58ac38eb91a21921b047da8644155e5678e9066af7bcb30ee0dca7361", - "sha256:55ef044899706c10bc0aa052f2fc2e58551e2510694d6aae13f37c50f3f6ff61", - "sha256:5e5796d2f36d3c48875514c5cd9e4325a1ca172fc6c78b469faa8ddd3d770593", - "sha256:5f199419a81c1016e0560c39773c12f0bd924c37715bffc64b97140d2c314354", - "sha256:5f55c4804797ef7381518e683249310f7f9646da271b71cb6b3552416c7894ee", - "sha256:6dcf53d35850ce938b4f044a43b33015ebde292840cef3af2c8eb4c860730fff", - "sha256:74e55f8d66f1b41d44bc44c891bcf2c7fad252f8f323ee86fba99d71fd1ad5e3", - "sha256:7f125fce0a0ae4fd5c3388d369d7a7d78f185f904c90dd235f7ecf8fe13fa741", - "sha256:82cfb97a36b1a53de32b642482c6c46b6ce80803854445e19bc49993655ebf3b", - "sha256:88dc3c1acd3f0ecfde5f95c32fcb9beda709dbdf5012acdcf66acbc4794468eb", - "sha256:924079d5590979c0e961681507eb1773a142553564ccae18d36f1de7324e71ca", - "sha256:951be934dc25d8779d92b530e922de44dda3c82a509cdb5d619f3a0b1491fafa", - "sha256:973499dac63625a5ef9dfa4c791aa33a502ddb7615d992bdc89cf2cc2285daa3", - "sha256:981c786293a3115bc14c103086ae54e5ee50ca57f4c02ce7cf1b60318d1e8072", - "sha256:9c070d5895ac6aeb665bd3cd79f673775caf8d33a0b569e98ac434617ecea57d", - "sha256:9e3e2cea8f1993f476a6833ef157f5d9e8c75a59a8d8b0395a9a6887a097243b", - "sha256:9e527ab1c4c7cf2643d93406c04e1d289a9d12966529381ce8163c4d2abe4faf", - "sha256:a37305eb3199d8f0d8125ec2fb143ba94ff6d6d92554c4b8d4a8435795a6eccd", - "sha256:aa0ab3530a279a3b7f50f852f1bab41bc304f098350b03e30a3876b7dd89840e", - "sha256:b04e512eb628ea82ed86eb31c0f7fc6842b46bf2601b66b1356a7008327f7700", - "sha256:b09d3904bf312d11308d9a2867427479d277365b1617e48ad09696fa7dfcdf59", - "sha256:b0f2f874c6a157c91708ac352470cb3bef8e8814f5325e3c5c7a0533064c6a24", - "sha256:b8b6ee6555b6fbae578f1468b3f685cdfe7940a65675611365a7ea1f8d724991", - "sha256:b9b5c215f3870aa9b011c00daeb7be7e1ae4ecd628e9beb6d7e6107e07d81287", - "sha256:c6569ba7b948c3d61d27f04e2b08ebee24fec9ff8e9ea154d8d1e975b175bfa7", - "sha256:e2ec1c106d3f754444abf63b31e5c4f9b5d272272a491fa4320475aba9e8157c", - "sha256:e4204708fa116dd03436a337e8e84261bc8051d058221ec63535c9403a1582a1", - "sha256:ea8de658d7db5987b11097445f2b1f134400e2232cb40e614e5f7b6f5428710e", - "sha256:f540f153c4f5617bc4ba6433534f8916d96366a08797cbbe4132c37b70403e92", - "sha256:fab3ab8aedfb443abb36729410403f0fe7f60ad860c19a979d47fb3eb98ef820", - "sha256:fb2baff66b7d2267e07ef71e17d01283b55b3cc51a81b54cc385e721ae172ba4", - "sha256:fe6ce4f3d3c48f9f402da1ceb571548133d3322003ce01b20d960a82251695d2", - "sha256:ff24897f6b2001c38a805d53b6ae72267025878d35ea225aa24675fbff2dba7f" - ], - "version": "==2021.10.8" + "sha256:0c186691a7995ef1db61205e00545bf161fb7b59cdb8c1201c89b333141c438a", + "sha256:0dcc0e71118be8c69252c207630faf13ca5e1b8583d57012aae191e7d6d28b84", + "sha256:0f7552429dd39f70057ac5d0e897e5bfe211629652399a21671e53f2a9693a4e", + "sha256:129472cd06062fb13e7b4670a102951a3e655e9b91634432cfbdb7810af9d710", + "sha256:13ec99df95003f56edcd307db44f06fbeb708c4ccdcf940478067dd62353181e", + "sha256:1f2b59c28afc53973d22e7bc18428721ee8ca6079becf1b36571c42627321c65", + "sha256:2b20f544cbbeffe171911f6ce90388ad36fe3fad26b7c7a35d4762817e9ea69c", + "sha256:2fb698037c35109d3c2e30f2beb499e5ebae6e4bb8ff2e60c50b9a805a716f79", + "sha256:34d870f9f27f2161709054d73646fc9aca49480617a65533fc2b4611c518e455", + "sha256:391703a2abf8013d95bae39145d26b4e21531ab82e22f26cd3a181ee2644c234", + "sha256:450dc27483548214314640c89a0f275dbc557968ed088da40bde7ef8fb52829e", + "sha256:45b65d6a275a478ac2cbd7fdbf7cc93c1982d613de4574b56fd6972ceadb8395", + "sha256:5095a411c8479e715784a0c9236568ae72509450ee2226b649083730f3fadfc6", + "sha256:530fc2bbb3dc1ebb17f70f7b234f90a1dd43b1b489ea38cea7be95fb21cdb5c7", + "sha256:56f0c81c44638dfd0e2367df1a331b4ddf2e771366c4b9c5d9a473de75e3e1c7", + "sha256:5e9c9e0ce92f27cef79e28e877c6b6988c48b16942258f3bc55d39b5f911df4f", + "sha256:6d7722136c6ed75caf84e1788df36397efdc5dbadab95e59c2bba82d4d808a4c", + "sha256:74d071dbe4b53c602edd87a7476ab23015a991374ddb228d941929ad7c8c922e", + "sha256:7b568809dca44cb75c8ebb260844ea98252c8c88396f9d203f5094e50a70355f", + "sha256:80bb5d2e92b2258188e7dcae5b188c7bf868eafdf800ea6edd0fbfc029984a88", + "sha256:8d1cdcda6bd16268316d5db1038965acf948f2a6f43acc2e0b1641ceab443623", + "sha256:9f665677e46c5a4d288ece12fdedf4f4204a422bb28ff05f0e6b08b7447796d1", + "sha256:a30513828180264294953cecd942202dfda64e85195ae36c265daf4052af0464", + "sha256:a7a986c45d1099a5de766a15de7bee3840b1e0e1a344430926af08e5297cf666", + "sha256:a940ca7e7189d23da2bfbb38973832813eab6bd83f3bf89a977668c2f813deae", + "sha256:ab7c5684ff3538b67df3f93d66bd3369b749087871ae3786e70ef39e601345b0", + "sha256:be04739a27be55631069b348dda0c81d8ea9822b5da10b8019b789e42d1fe452", + "sha256:c0938ddd60cc04e8f1faf7a14a166ac939aac703745bfcd8e8f20322a7373019", + "sha256:cb46b542133999580ffb691baf67410306833ee1e4f58ed06b6a7aaf4e046952", + "sha256:d134757a37d8640f3c0abb41f5e68b7cf66c644f54ef1cb0573b7ea1c63e1509", + "sha256:de557502c3bec8e634246588a94e82f1ee1b9dfcfdc453267c4fb652ff531570", + "sha256:ded0c4a3eee56b57fcb2315e40812b173cafe79d2f992d50015f4387445737fa", + "sha256:e1dae12321b31059a1a72aaa0e6ba30156fe7e633355e445451e4021b8e122b6", + "sha256:eb672217f7bd640411cfc69756ce721d00ae600814708d35c930930f18e8029f", + "sha256:ee684f139c91e69fe09b8e83d18b4d63bf87d9440c1eb2eeb52ee851883b1b29", + "sha256:f3f9a91d3cc5e5b0ddf1043c0ae5fa4852f18a1c0050318baf5fc7930ecc1f9c" + ], + "version": "==2021.10.23" }, "tomli": { "hashes": [ - "sha256:8dd0e9524d6f386271a36b41dbf6c57d8e32fd96fd22b6584679dc569d20899f", - "sha256:a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442" + "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee", + "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade" ], "markers": "python_version >= '3.6'", - "version": "==1.2.1" + "version": "==1.2.2" }, "typing-extensions": { "hashes": [ diff --git a/backend/messaging.py b/backend/messaging.py index ee2590df0..7fcb6f0d2 100644 --- a/backend/messaging.py +++ b/backend/messaging.py @@ -190,17 +190,44 @@ def edit_message(request, message_id, room_id): @db_init_with_credentials def delete_message(request, message_id, room_id): """ - This function deletes message in rooms using message - organization id (org_id), room id (room_id) and the message id (message_id). + Deletes a message from a room. + + It access room with the 'room_id' and the message in the room with 'message_id' and then deletes the message if it exists. + The id of the organization (org_id) where the room is located is also needed. + + Parameters: + org_id (str) : This is the id of the organization th user belongs to. + + room_id (str) : This is the unique id of the room the message to be deleted is in. + + message_id (str) : This is the unique id of the message to be deleted from a given room. + + Returns: + A dict object indicating the the message has been deleted. Example: + { + "status" : "success", + "event" : "message_delete", + "room_id" : "6169dbcef5998a09e3bbbcd3", + "message_id" : "616ad4f989454c2006018af2" + } + + Raises: + Not Found: If there is no message with specified id in the specified room, it returns 'message not found' and a '404' error message. + + IOError: An error occurred while deleteing the message. """ if request.method == "DELETE": try: + # Sends a get request to the database to fetch the message and the room of the message from. message = DB.read("dm_messages", {"_id": message_id}) room = DB.read("dm_rooms", {"_id": room_id}) + # Checks if the room exists and if the message exists in the room. + # If this returns true, the message is deleted. Else an error message is returned. if room and message: response = DB.delete("dm_messages", message_id) + # if the delete operation was successful, it returns a success message. if response.get("status") == 200: response_output = { "status": response["message"], @@ -208,9 +235,11 @@ def delete_message(request, message_id, room_id): "room_id": room_id, "message_id": message_id, } + # This publishes the operation across all active devices in the room where the operation was performed. centrifugo_data = centrifugo_client.publish( room=room_id, data=response ) + # Checks if the publish was successful and returns a success message if True, else an error message is returned. if centrifugo_data and centrifugo_data.get("status_code") == 200: return Response(response_output, status=status.HTTP_200_OK) return Response( @@ -219,6 +248,7 @@ def delete_message(request, message_id, room_id): ) return Response("message not found", status=status.HTTP_404_NOT_FOUND) except Exception as e: + # All exeptions are caught are returned here... return Response(str(e), status=status.HTTP_400_BAD_REQUEST) diff --git a/zc_plugin_dm/settings.py b/zc_plugin_dm/settings.py index 4109c459d..804e2be56 100644 --- a/zc_plugin_dm/settings.py +++ b/zc_plugin_dm/settings.py @@ -28,7 +28,7 @@ DEBUG = True # str(os.getenv('DEBUG')) -ALLOWED_HOSTS = ["dm.zuri.chat", "127.0.0.1", "zuri.chat/dm"] +ALLOWED_HOSTS = ["dm.zuri.chat", "127.0.0.1", "zuri.chat/dm", "localhost"] CORS_ALLOW_ALL_ORIGINS = True # CORS_ALLOWED_ORIGINS = [ # # "https://zuri.chat", From 879ebb917895300ad777bbdcdd1376d99cb65d8d Mon Sep 17 00:00:00 2001 From: paisoncodes Date: Fri, 29 Oct 2021 16:06:01 +0100 Subject: [PATCH 4/4] fixed the call --- backend/messaging.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/messaging.py b/backend/messaging.py index 7fcb6f0d2..6167e74e2 100644 --- a/backend/messaging.py +++ b/backend/messaging.py @@ -220,12 +220,11 @@ def delete_message(request, message_id, room_id): if request.method == "DELETE": try: # Sends a get request to the database to fetch the message and the room of the message from. - message = DB.read("dm_messages", {"_id": message_id}) - room = DB.read("dm_rooms", {"_id": room_id}) + message = DB.read("dm_messages", {"_id": message_id, "room_id": room_id}) # Checks if the room exists and if the message exists in the room. # If this returns true, the message is deleted. Else an error message is returned. - if room and message: + if message: response = DB.delete("dm_messages", message_id) # if the delete operation was successful, it returns a success message. if response.get("status") == 200: