diff --git a/README.dev.md b/README.dev.md index 98f8bdd..1811058 100644 --- a/README.dev.md +++ b/README.dev.md @@ -114,7 +114,6 @@ the settings to your needs: LATEST_VERSION_RELEASES_DIRECTORY = '/path/to/geany/releases/directory/or/just/empty' LATEST_VERSION_PLUGINS_RELEASES_DIRECTORY = '/path/to/plugins/releases/directory/or/just/empty' STATIC_DOCS_GEANY_SOURCE_TARBALL = '/path/to/geany/source/tarball/or/just/empty' - IRC_USER_LIST_FILE = '/path/to/irc/data/or/just/empty' ### Database settings diff --git a/README.md b/README.md index 28a1490..1d14fad 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,6 @@ with non-static content. * documentation/todo.md: generated from Github upon request * download/nightly-builds.md: generated upon request * fake.md: dummy page for various non-CMS pages like pastebin.geany.org and more - * support/irc.md: dynamic content is added to the page upon request #### Supported Markdown Extensions diff --git a/docker/Dockerfile b/docker/Dockerfile index a211303..2ddc532 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -95,7 +95,7 @@ USER nobody:nogroup # copy in Python environment COPY --from=builder /venv /venv # copy helpers and configs -COPY ./docker/entrypoint.sh ./docker/irc_userlist /data/ +COPY ./docker/entrypoint.sh /data/ EXPOSE 8000 CMD ["/bin/bash", "/data/entrypoint.sh"] diff --git a/docker/local_settings.docker.py b/docker/local_settings.docker.py index f5c5021..bd314d7 100644 --- a/docker/local_settings.docker.py +++ b/docker/local_settings.docker.py @@ -48,7 +48,6 @@ DEFAULT_FROM_EMAIL = 'root@localhost' NIGHTLYBUILDS_BASE_DIR = os.path.join(MEDIA_ROOT, 'nightly_mirror') -IRC_USER_LIST_FILE = '/data/irc_userlist' STATIC_DOCS_GEANY_SOURCE_TARBALL = '/tmp/geany_git.tar.gz' STATIC_DOCS_GEANY_DESTINATION_DIR = os.path.join(MEDIA_ROOT, 'i18n') diff --git a/geany/settings.py b/geany/settings.py index 41e38f7..90a7ff9 100644 --- a/geany/settings.py +++ b/geany/settings.py @@ -461,8 +461,6 @@ STATIC_DOCS_GEANY_DESTINATION_URL = os.path.join(MEDIA_URL, 'i18n') STATIC_DOCS_GEANY_I18N_STATISTICS_FILENAME = 'i18n_statistics.json' -IRC_USER_LIST_FILE = '/srv/tmp/irc_userlist' - LATEST_VERSION_RELEASES_DIRECTORY = '/srv/www/download.geany.org' LATEST_VERSION_PLUGINS_RELEASES_DIRECTORY = '/srv/www/plugins.geany.org/geany-plugins/' diff --git a/geany/templates/home.html b/geany/templates/home.html index fc9c710..8a984d2 100644 --- a/geany/templates/home.html +++ b/geany/templates/home.html @@ -137,7 +137,6 @@

Great Community

that contribute improvements and fixes across numerous platforms including The Mailing Lists, - IRC, Github and Twitter.

Get Involved » diff --git a/geany/templates/pages/support/irc.html b/geany/templates/pages/support/irc.html deleted file mode 100644 index beaf1b6..0000000 --- a/geany/templates/pages/support/irc.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "pages/richtextpage.html" %} - -{% load geany_tags %} - -{% block content_after %} - -{% get_irc_userlist as irc_userlist %} - -

Users

- -

Currently {{ irc_userlist|length }} users are connected:

- -
-{% for username in irc_userlist %} -
{{ username }}
- - {% if forloop.counter|divisibleby:4 %} -
-
- {% endif %} -{% endfor %} -
- - -{% endblock %} diff --git a/geany/templatetags/geany_tags.py b/geany/templatetags/geany_tags.py index f3d2ea0..12c4013 100644 --- a/geany/templatetags/geany_tags.py +++ b/geany/templatetags/geany_tags.py @@ -15,7 +15,6 @@ import logging from django import template -from django.conf import settings from mezzanine.template import Library @@ -58,21 +57,6 @@ def do_evaluate(parser, token): # pylint: disable=unused-argument return EvaluateNode(variable, target_var_name) -# ---------------------------------------------------------------------- -@register.simple_tag -def get_irc_userlist(): - user_list = list() - try: - with open(settings.IRC_USER_LIST_FILE) as file_h: - user_list = file_h.readlines() - except IOError as exc: - logger.error('An error occurred reading IRC user list: {}'.format(exc), exc_info=True) - - # remove newline characters - user_list = [username.strip() for username in user_list] - return sorted(user_list) - - # ---------------------------------------------------------------------- @register.filter(name='add_css') def add_css(field, css): diff --git a/geany/urls_legacy.py b/geany/urls_legacy.py index efaae80..937dbf6 100644 --- a/geany/urls_legacy.py +++ b/geany/urls_legacy.py @@ -71,7 +71,8 @@ '/Support/Developers': '/contribute/development/', '/Support/Hacking': '/documentation/hacking/', '/Support/I18N': '/contribute/translation/', - '/Support/IRC': '/support/irc/', + '/Support/IRC': '/support/', + '/support/irc/': '/support/', '/Support/MailingList': '/support/mailing-lists/', '/Support/PluginWishlist/': 'https://github.com/geany/geany-plugins/issues?q=is%%3Aissue+label%%3Afeature+', diff --git a/page_content/about/geany.md b/page_content/about/geany.md index 0e3c100..0c91bcc 100644 --- a/page_content/about/geany.md +++ b/page_content/about/geany.md @@ -35,12 +35,10 @@ The code is licensed under the terms of the [GNU General Public Licence][3]. ## Contact -To contact us for general questions or feedback, either use one of our [mailing lists][4], the [IRC channel][5] or the [Github issue tracker][6]. - +To contact us for general questions or feedback, either use one of our [mailing lists][4] or the [Github issue tracker][5]. [1]: /about/filetypes/ [2]: /support/plugins/ [3]: https://www.gnu.org/licenses/gpl-2.0.en.html [4]: /support/mailing-lists - [5]: /support/irc - [6]: https://github.com/geany/geany/issues + [5]: https://github.com/geany/geany/issues diff --git a/page_content/contribute/support.md b/page_content/contribute/support.md index e3674a2..62b3cfd 100644 --- a/page_content/contribute/support.md +++ b/page_content/contribute/support.md @@ -9,13 +9,9 @@ There are different ways you can support Geany users. Yes, even supporting users You can subscribe to the [Geany Users mailing list][1] and answer questions, give hints to people who write there and so on. -### IRC - -There are many people who join IRC and ask questions. You can join us on [#geany][2] on chat.freenode.net and help out answering questions there. - ### Bug Zapping -You can also surf through the bugs reported at the [Github issue tracker][3] and see if you maybe can help users. Some issues reported are not actually bugs and maybe can be solved with your help. +You can also surf through the bugs reported at the [Github issue tracker][2] and see if you maybe can help users. Some issues reported are not actually bugs and maybe can be solved with your help. ### Twitter @@ -23,5 +19,4 @@ Geany's twitter stream: https://twitter.com/GeanyIDE/ [1]: /support/mailing-lists/ - [2]: irc://chat.freenode.net/geany%7C#geany - [3]: https://github.com/geany/geany/issues + [2]: https://github.com/geany/geany/issues diff --git a/page_content/support.md b/page_content/support.md index b4ab543..265aa52 100644 --- a/page_content/support.md +++ b/page_content/support.md @@ -4,10 +4,8 @@ Support There are multiple ways to get support on using Geany and/or ask questions: - [Mailing Lists][1] -- [IRC (chat)][2] -- [Issue tracker / Bugs][3] +- [Issue tracker / Bugs][2] [1]: /support/mailing-lists/ -[2]: /support/irc/ -[3]: /support/bugs/ +[2]: /support/bugs/ diff --git a/page_content/support/irc.md b/page_content/support/irc.md deleted file mode 100644 index 2155213..0000000 --- a/page_content/support/irc.md +++ /dev/null @@ -1,12 +0,0 @@ -IRC chat -========== - -If you have a problem, a question or anything else to talk about, join our IRC channel irc://chat.freenode.net/geany|#geany on chat.freenode.net. - -**Due to spam, as of 2018-08-01, you need to be registered and identified** with Freenode's account service to speak in geany-affiliated channels. - -Follow freenode's instructions: . - -IRC channel logs: https://irc.geany.org/logs/. - -IRC channel stats: https://irc.geany.org/stats/.