patch 6a0451271e91ed7c081a631b49780c0f3ed761e7

Author: E. Bosch <presidev@AT@gmail.com>

Date: Sat Feb 12 03:02:43 CET 2022

* irc: Add special case localhost for hostname

use FQDN if possible instead of simple hostname

- self.hostname = socket.gethostname()

+ self.hostname = socket.getfqdn()

- if not target or target == self.hostname:

+ if not target or target == self.gethostname(user):

- await self.reply_command(user, SRV, 'PONG', (self.hostname, payload))

+ await self.reply_command(user, SRV, 'PONG', (self.gethostname(user), payload))

- usr.address, self.hostname, usr.irc_nick, op, usr.irc_realname

+ usr.address, self.gethostname(user), usr.irc_nick, op, usr.irc_realname

- await self.reply_code(user, 'RPL_WHOISSERVER', (real_ni, self.hostname))

+ await self.reply_code(user, 'RPL_WHOISSERVER', (real_ni, self.gethostname(user)))

- server = self.hostname if usr.stream else 'Telegram'

+ server = self.gethostname(user) if usr.stream else 'Telegram'

- if not tgt or tgt == self.hostname or tgt in self.users.keys():

- await self.reply_code(user, 'RPL_VERSION', (VERSION, self.hostname))

+ if not tgt or tgt == self.gethostname(user) or tgt in self.users.keys():

+ await self.reply_code(user, 'RPL_VERSION', (VERSION, self.gethostname(user)))

- prefix = self.hostname if prfx == SRV else prfx.get_irc_mask()

+ prefix = self.gethostname(user) if prfx == SRV else prfx.get_irc_mask()

- stri = ':{} {} {} {}'.format(self.hostname, num, nick, rest)

+ stri = ':{} {} {} {}'.format(self.gethostname(user), num, nick, rest)

- stri = ':{} {} {} :{}'.format(self.hostname, num, user.irc_nick, tail)

+ stri = ':{} {} {} :{}'.format(self.gethostname(user), num, user.irc_nick, tail)

- await self.reply_code(user, 'RPL_YOURHOST', (self.hostname, VERSION))

+ await self.reply_code(user, 'RPL_YOURHOST', (self.gethostname(user), VERSION))

- await self.reply_code(user, 'RPL_MYINFO', (self.hostname, VERSION))

+ await self.reply_code(user, 'RPL_MYINFO', (self.gethostname(user), VERSION))

- await self.reply_code(user, 'RPL_MOTDSTART', (self.hostname,))

+ await self.reply_code(user, 'RPL_MOTDSTART', (self.gethostname(user),))

+ def gethostname(self, user):

+ return 'localhost' if user.from_localhost else self.hostname

+

+ self.from_localhost = True if address[0].split('.')[0] == '127' else False