Skip to content

Commit

Permalink
Merge pull request #30 from geany/remove_irc
Browse files Browse the repository at this point in the history
Bye bye IRC @ Freenode, RIP.
  • Loading branch information
geanyadmin authored Jun 21, 2021
2 parents 54a4c0e + 7a30a2a commit ba2508a
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 76 deletions.
1 change: 0 additions & 1 deletion README.dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 0 additions & 1 deletion docker/local_settings.docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 0 additions & 2 deletions geany/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/'

Expand Down
1 change: 0 additions & 1 deletion geany/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ <h2 class="text-center">Great Community</h2>
that contribute improvements and fixes across numerous
platforms including
<a href="{% url "page" "support/mailing-lists" %}">The Mailing Lists</a>,
<a href="{% url "page" "support/irc" %}">IRC</a>,
<a href="https://github.com/geany">Github</a> and
<a href="https://twitter.com/GeanyIDE/">Twitter</a>.</p>
<p><a class="btn btn-default" href="{% url "page" "contribute" %}">Get Involved &raquo;</a>
Expand Down
25 changes: 0 additions & 25 deletions geany/templates/pages/support/irc.html

This file was deleted.

16 changes: 0 additions & 16 deletions geany/templatetags/geany_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import logging

from django import template
from django.conf import settings
from mezzanine.template import Library


Expand Down Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion geany/urls_legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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+',
Expand Down
6 changes: 2 additions & 4 deletions page_content/about/geany.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 2 additions & 7 deletions page_content/contribute/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,14 @@ 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

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
6 changes: 2 additions & 4 deletions page_content/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
12 changes: 0 additions & 12 deletions page_content/support/irc.md

This file was deleted.

0 comments on commit ba2508a

Please sign in to comment.