docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
config.Lock()
defer config.Unlock()
| <mask>
<mask> func startDNSServer() error {
<mask> if isRunning() {
<mask> return fmt.Errorf("unable to start forwarding DNS server: Already running")
<mask> }
<mask>
</s> Pull request: all: fix some races
Updates #3087.
Squashed commit of the following:
commit e888ce524f286f3c34e14e0086336b65a95fa020
Author: Ainar Garipov <[email protected]>
Date: Mon May 17 16:34:10 2021 +0300
all: fix some races </s> remove resp := statusResponse{
DNSAddrs: dnsAddrs,
DNSPort: config.DNS.Port,
HTTPPort: config.BindPort,
IsRunning: isRunning(),
Version: version.Version(),
Language: config.Language,
}
</s> add var resp statusResponse
func() {
config.RLock()
defer config.RUnlock()
resp = statusResponse{
DNSAddrs: dnsAddrs,
DNSPort: config.DNS.Port,
HTTPPort: config.BindPort,
IsRunning: isRunning(),
Version: version.Version(),
Language: config.Language,
}
}() </s> remove config.Language = language
</s> add func() {
config.Lock()
defer config.Unlock()
config.Language = language
}()
</s> remove github.com/AdguardTeam/dnsproxy v0.37.2 h1:3lgizD+lZI6uqxFiQykd1/hV7Ji4vSJBMejl1rbFAXU=
github.com/AdguardTeam/dnsproxy v0.37.2/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
</s> add github.com/AdguardTeam/dnsproxy v0.37.4 h1:YIoJkIp828LKmmmgxXvZHUKfGLsqTQAK8g+4DXbDbyU=
github.com/AdguardTeam/dnsproxy v0.37.4/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE= </s> remove github.com/AdguardTeam/dnsproxy v0.37.2
</s> add github.com/AdguardTeam/dnsproxy v0.37.4 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5acae6e204ab3f5d92449c1231dee754c1db9abb | internal/home/dns.go |
func() {
config.Lock()
defer config.Unlock()
config.Language = language
}()
| <mask>
<mask> return
<mask> }
<mask>
<mask> config.Language = language
<mask> onConfigModified()
<mask> returnOK(w)
<mask> }
</s> Pull request: all: fix some races
Updates #3087.
Squashed commit of the following:
commit e888ce524f286f3c34e14e0086336b65a95fa020
Author: Ainar Garipov <[email protected]>
Date: Mon May 17 16:34:10 2021 +0300
all: fix some races </s> remove resp := statusResponse{
DNSAddrs: dnsAddrs,
DNSPort: config.DNS.Port,
HTTPPort: config.BindPort,
IsRunning: isRunning(),
Version: version.Version(),
Language: config.Language,
}
</s> add var resp statusResponse
func() {
config.RLock()
defer config.RUnlock()
resp = statusResponse{
DNSAddrs: dnsAddrs,
DNSPort: config.DNS.Port,
HTTPPort: config.BindPort,
IsRunning: isRunning(),
Version: version.Version(),
Language: config.Language,
}
}() </s> remove github.com/AdguardTeam/dnsproxy v0.37.2 h1:3lgizD+lZI6uqxFiQykd1/hV7Ji4vSJBMejl1rbFAXU=
github.com/AdguardTeam/dnsproxy v0.37.2/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
</s> add github.com/AdguardTeam/dnsproxy v0.37.4 h1:YIoJkIp828LKmmmgxXvZHUKfGLsqTQAK8g+4DXbDbyU=
github.com/AdguardTeam/dnsproxy v0.37.4/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE= </s> remove github.com/AdguardTeam/dnsproxy v0.37.2
</s> add github.com/AdguardTeam/dnsproxy v0.37.4 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5acae6e204ab3f5d92449c1231dee754c1db9abb | internal/home/i18n.go |
renderInputField, | <mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import {
<mask> renderField,
<mask> renderRadioField,
<mask> renderSelectField,
<mask> required,
<mask> ipv4,
<mask> ipv6,
</s> * client: fix render field for DNS settings </s> remove component={renderField}
</s> add component={renderInputField} </s> remove component={renderField}
</s> add component={renderInputField} </s> remove component={renderField}
</s> add component={renderInputField} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5ba45b91c9cfde84fc0866e6b3fca679504975e7 | client/src/components/Settings/Dns/Config/Form.js |
component={renderInputField} | <mask> </div>
<mask> <Field
<mask> name="ratelimit"
<mask> type="number"
<mask> component={renderField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_rate_limit')}
<mask> normalize={toNumber}
<mask> validate={[required, biggerOrEqualZero]}
<mask> />
</s> * client: fix render field for DNS settings </s> remove component={renderField}
</s> add component={renderInputField} </s> remove component={renderField}
</s> add component={renderInputField} </s> remove renderField,
</s> add renderInputField, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5ba45b91c9cfde84fc0866e6b3fca679504975e7 | client/src/components/Settings/Dns/Config/Form.js |
component={renderInputField} | <mask> <Trans>blocking_ipv4_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="blocking_ipv4"
<mask> component={renderField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv4, required]}
<mask> />
<mask> </div>
</s> * client: fix render field for DNS settings </s> remove component={renderField}
</s> add component={renderInputField} </s> remove component={renderField}
</s> add component={renderInputField} </s> remove renderField,
</s> add renderInputField, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5ba45b91c9cfde84fc0866e6b3fca679504975e7 | client/src/components/Settings/Dns/Config/Form.js |
component={renderInputField} | <mask> <Trans>blocking_ipv6_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="blocking_ipv6"
<mask> component={renderField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv6, required]}
<mask> />
<mask> </div>
</s> * client: fix render field for DNS settings </s> remove component={renderField}
</s> add component={renderInputField} </s> remove component={renderField}
</s> add component={renderInputField} </s> remove renderField,
</s> add renderInputField, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5ba45b91c9cfde84fc0866e6b3fca679504975e7 | client/src/components/Settings/Dns/Config/Form.js |
AllServers: false, | <mask> QueryLogEnabled: true,
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> BootstrapDNS: "8.8.8.8:53",
<mask> },
<mask> UpstreamDNS: defaultDNS,
<mask> },
<mask> TLS: tlsConfig{
</s> Fix #596 - Intelligent Optimal DNS Resolution | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5bc6d00aa03baa826ed84b3c134ed80db05e1388 | config.go |
"all_servers": config.DNS.AllServers, | <mask> "querylog_enabled": config.DNS.QueryLogEnabled,
<mask> "running": isRunning(),
<mask> "bootstrap_dns": config.DNS.BootstrapDNS,
<mask> "upstream_dns": config.DNS.UpstreamDNS,
<mask> "version": VersionString,
<mask> "language": config.Language,
<mask> }
<mask>
<mask> jsonVal, err := json.Marshal(data)
</s> Fix #596 - Intelligent Optimal DNS Resolution | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5bc6d00aa03baa826ed84b3c134ed80db05e1388 | control.go |
http.HandleFunc("/control/all_servers/enable", postInstall(optionalAuth(ensurePOST(handleAllServersEnable))))
http.HandleFunc("/control/all_servers/disable", postInstall(optionalAuth(ensurePOST(handleAllServersDisable))))
http.HandleFunc("/control/all_servers/status", postInstall(optionalAuth(ensureGET(handleAllServersStatus)))) | <mask> http.HandleFunc("/control/querylog_enable", postInstall(optionalAuth(ensurePOST(handleQueryLogEnable))))
<mask> http.HandleFunc("/control/querylog_disable", postInstall(optionalAuth(ensurePOST(handleQueryLogDisable))))
<mask> http.HandleFunc("/control/set_upstream_dns", postInstall(optionalAuth(ensurePOST(handleSetUpstreamDNS))))
<mask> http.HandleFunc("/control/test_upstream_dns", postInstall(optionalAuth(ensurePOST(handleTestUpstreamDNS))))
<mask> http.HandleFunc("/control/i18n/change_language", postInstall(optionalAuth(ensurePOST(handleI18nChangeLanguage))))
<mask> http.HandleFunc("/control/i18n/current_language", postInstall(optionalAuth(ensureGET(handleI18nCurrentLanguage))))
<mask> http.HandleFunc("/control/stats_top", postInstall(optionalAuth(ensureGET(handleStatsTop))))
<mask> http.HandleFunc("/control/stats", postInstall(optionalAuth(ensureGET(handleStats))))
<mask> http.HandleFunc("/control/stats_history", postInstall(optionalAuth(ensureGET(handleStatsHistory))))
</s> Fix #596 - Intelligent Optimal DNS Resolution | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5bc6d00aa03baa826ed84b3c134ed80db05e1388 | control.go |
AllServers bool `yaml:"all_servers"` | <mask> Ratelimit int `yaml:"ratelimit"`
<mask> RatelimitWhitelist []string `yaml:"ratelimit_whitelist"`
<mask> RefuseAny bool `yaml:"refuse_any"`
<mask> BootstrapDNS string `yaml:"bootstrap_dns"`
<mask>
<mask> dnsfilter.Config `yaml:",inline"`
<mask> }
<mask>
<mask> // TLSConfig is the TLS configuration for HTTPS, DNS-over-HTTPS, and DNS-over-TLS
</s> Fix #596 - Intelligent Optimal DNS Resolution | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5bc6d00aa03baa826ed84b3c134ed80db05e1388 | dnsforward/dnsforward.go |
AllServers: s.AllServers, | <mask> Upstreams: s.Upstreams,
<mask> Handler: s.handleDNSRequest,
<mask> }
<mask>
<mask> if s.TLSListenAddr != nil && s.CertificateChain != "" && s.PrivateKey != "" {
<mask> proxyConfig.TLSListenAddr = s.TLSListenAddr
<mask> keypair, err := tls.X509KeyPair([]byte(s.CertificateChain), []byte(s.PrivateKey))
<mask> if err != nil {
</s> Fix #596 - Intelligent Optimal DNS Resolution | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5bc6d00aa03baa826ed84b3c134ed80db05e1388 | dnsforward/dnsforward.go |
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import { getDnsAddress } from '../../helpers/helpers';
<mask>
<mask> const Version = (props) => {
<mask> const {
<mask> dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
<mask> } = props;
<mask>
</s> + client: add DNS privacy tab to setup guide </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove const Guide = () => (
</s> add const Guide = props => ( </s> remove dnsPort,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/Header/Version.js |
|
dnsVersion, dnsAddresses, processingVersion, t, | <mask> import { getDnsAddress } from '../../helpers/helpers';
<mask>
<mask> const Version = (props) => {
<mask> const {
<mask> dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
<mask> } = props;
<mask>
<mask> return (
<mask> <div className="nav-version">
<mask> <div className="nav-version__text">
</s> + client: add DNS privacy tab to setup guide </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove dnsPort,
</s> add </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove const Guide = () => (
</s> add const Guide = props => ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/Header/Version.js |
{dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} | <mask> <Trans>dns_addresses</Trans>
<mask> </div>
<mask> <div className="popover__body popover__body--address">
<mask> <div className="popover__list">
<mask> {dnsAddresses.map(ip => (
<mask> <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
<mask> ))}
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> );
</s> + client: add DNS privacy tab to setup guide </s> remove {dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</s> add {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} </s> remove {label}
</s> add {title || label} </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; </s> remove const Guide = () => (
</s> add const Guide = props => ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/Header/Version.js |
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import { getDnsAddress } from '../../helpers/helpers';
<mask>
<mask> import Guide from '../ui/Guide';
<mask> import Card from '../ui/Card';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import './Guide.css';
<mask>
</s> + client: add DNS privacy tab to setup guide </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove const Guide = () => (
</s> add const Guide = props => ( </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove {label}
</s> add {title || label} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/SetupGuide/index.js |
|
<mask> const SetupGuide = ({
<mask> t,
<mask> dashboard: {
<mask> dnsAddresses,
<mask> dnsPort,
<mask> },
<mask> }) => (
<mask> <div className="guide">
<mask> <PageTitle title={t('setup_guide')} />
<mask> <Card>
</s> + client: add DNS privacy tab to setup guide </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove const Guide = () => (
</s> add const Guide = props => ( </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/SetupGuide/index.js |
|
{dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} | <mask> <div className="mt-1">
<mask> <Trans>install_devices_address</Trans>:
<mask> </div>
<mask> <div className="mt-2 font-weight-bold">
<mask> {dnsAddresses
<mask> .map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
<mask> }
<mask> </div>
<mask> </div>
<mask> <Guide />
<mask> </Card>
<mask> </div>
</s> + client: add DNS privacy tab to setup guide </s> remove {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))}
</s> add {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} </s> remove {label}
</s> add {title || label} </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove const Guide = () => (
</s> add const Guide = props => ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/SetupGuide/index.js |
import PropTypes from 'prop-types'; | <mask> import React from 'react';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import Tabs from '../ui/Tabs';
<mask> import Icons from '../ui/Icons';
</s> + client: add DNS privacy tab to setup guide </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove const Guide = () => (
</s> add const Guide = props => ( </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove {label}
</s> add {title || label} | [
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Guide.js |
const Guide = props => ( | <mask>
<mask> import Tabs from '../ui/Tabs';
<mask> import Icons from '../ui/Icons';
<mask>
<mask> const Guide = () => (
<mask> <div>
<mask> <Icons />
<mask> <Tabs>
<mask> <div label="Router">
<mask> <div className="tab__title">
</s> + client: add DNS privacy tab to setup guide </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove dnsPort,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Guide.js |
<symbol id="dns_privacy" viewBox="0 0 30 30" stroke="none" fill="currentColor" strokeLinecap="round" strokeLinejoin="round">
<path d="M15 3C10.57 3 6.701 5.419 4.623 9h2.39a10.063 10.063 0 0 1 4.05-3.19c-.524.89-.961 1.973-1.3 3.19h2.108c.79-2.459 1.998-4 3.129-4s2.339 1.541 3.129 4h2.107c-.338-1.217-.774-2.3-1.299-3.19A10.062 10.062 0 0 1 22.989 9h2.389C23.298 5.419 19.43 3 15 3zm7.035 9.129c-1.372 0-2.264.73-2.264 1.842 0 .896.538 1.463 1.579 1.66l.75.15c.65.13.898.3.898.615 0 .375-.37.635-.91.635-.6 0-1.014-.265-1.049-.68h-1.38c.023 1.097.93 1.776 2.37 1.776 1.491 0 2.399-.717 2.399-1.904 0-.903-.504-1.412-1.63-1.63l-.734-.142c-.6-.118-.851-.3-.851-.611 0-.378.336-.62.844-.62.509 0 .891.28.923.682h1.336c-.024-1.053-.948-1.773-2.28-1.773zm-16.185.148v5.696h2.39c1.712 0 2.662-1.033 2.662-2.903 0-1.779-.966-2.793-2.662-2.793H5.85zm6.933.004v5.692h1.373v-3.235h.076l2.377 3.235h1.149V12.28h-1.373v3.203h-.076l-2.372-3.203h-1.154zm-5.486 1.16h.682c.912 0 1.449.596 1.449 1.657 0 1.128-.51 1.713-1.45 1.713h-.681v-3.37zM4.623 21C6.701 24.581 10.57 27 15 27c4.43 0 8.299-2.419 10.377-6h-2.389a10.063 10.063 0 0 1-4.049 3.19c.524-.89.96-1.973 1.297-3.19H18.13c-.79 2.459-1.996 4-3.127 4-1.131 0-2.339-1.541-3.129-4h-2.11c.339 1.217.776 2.3 1.3 3.19A10.056 10.056 0 0 1 7.013 21h-2.39z"></path>
</symbol> | <mask> <symbol id="refresh" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M23 4v6h-6M1 20v-6h6"/><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"/>
<mask> </symbol>
<mask> </svg>
<mask> );
<mask>
<mask> export default Icons;
</s> + client: add DNS privacy tab to setup guide </s> remove {label}
</s> add {title || label} </s> remove {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))}
</s> add {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Icons.js |
title, | <mask> const {
<mask> activeTab,
<mask> label,
<mask> } = this.props;
<mask>
<mask> const tabClass = classnames({
<mask> tab__control: true,
<mask> 'tab__control--active': activeTab === label,
</s> + client: add DNS privacy tab to setup guide </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove const Guide = () => (
</s> add const Guide = props => ( </s> remove dnsPort,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Tab.js |
{title || label} | <mask> >
<mask> <svg className="tab__icon">
<mask> <use xlinkHref={`#${label.toLowerCase()}`} />
<mask> </svg>
<mask> {label}
<mask> </div>
<mask> );
<mask> }
<mask> }
<mask>
</s> + client: add DNS privacy tab to setup guide </s> remove {dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</s> add {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} </s> remove {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))}
</s> add {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Tab.js |
title: PropTypes.string, | <mask> activeTab: PropTypes.string.isRequired,
<mask> label: PropTypes.string.isRequired,
<mask> onClick: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default Tab;
</s> + client: add DNS privacy tab to setup guide </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; </s> remove {label}
</s> add {title || label} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Tab.js |
const { label, title } = child.props; | <mask> return (
<mask> <div className="tabs">
<mask> <div className="tabs__controls">
<mask> {children.map((child) => {
<mask> const { label } = child.props;
<mask>
<mask> return (
<mask> <Tab
<mask> key={label}
<mask> label={label}
</s> + client: add DNS privacy tab to setup guide </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove const Guide = () => (
</s> add const Guide = props => ( </s> remove dnsPort,
</s> add </s> remove import { getDnsAddress } from '../../helpers/helpers';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Tabs.js |
title={title} | <mask> return (
<mask> <Tab
<mask> key={label}
<mask> label={label}
<mask> activeTab={activeTab}
<mask> onClick={this.onClickTabControl}
<mask> />
<mask> );
</s> + client: add DNS privacy tab to setup guide </s> remove const { label } = child.props;
</s> add const { label, title } = child.props; </s> remove {label}
</s> add {title || label} </s> remove dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
</s> add dnsVersion, dnsAddresses, processingVersion, t, </s> remove {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))}
</s> add {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)} </s> remove dnsPort,
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c7c9964b86773855a834b31329ab3c7e98e2554 | client/src/components/ui/Tabs.js |
"import/prefer-default-export": "off",
"no-alert": "off" | <mask> "no-shadow": "off",
<mask> "camelcase": "off",
<mask> "no-console": ["warn", { "allow": ["warn", "error"] }],
<mask> "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
<mask> "import/prefer-default-export": "off"
<mask> }
<mask> }
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} </s> remove .logs__table .rt-tr:hover .logs__action {
</s> add .logs__table .rt-tr:hover .logs__action,
.clients__table .rt-tr:hover .table__action { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/.eslintrc |
"check_not_found": "Doesn't exist in any filter",
"client_confirm_block": "Are you sure you want to block the client \"{{ip}}\"?",
"client_confirm_unblock": "Are you sure you want to unblock the client \"{{ip}}\"?",
"client_blocked": "Client \"{{ip}}\" successfully blocked",
"client_unblocked": "Client \"{{ip}}\" successfully unblocked" | <mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Reason: {{reason}}",
<mask> "check_rule": "Rule: {{rule}}",
<mask> "check_service": "Service name: {{service}}",
<mask> "check_not_found": "Doesn't exist in any filter"
<mask> }
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove data={topClients.map(({ name: ip, count, info }) => ({
</s> add data={topClients.map(({
name: ip, count, info, blocked,
}) => ({ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/__locales/en.json |
import { t } from 'i18next';
| <mask> import { createAction } from 'redux-actions';
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { getStats, getStatsConfig } from './stats';
<mask> import { normalizeTextarea } from '../helpers/helpers';
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; </s> remove import React from 'react';
</s> add import React, { Fragment } from 'react'; | [
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/access.js |
import { getStats, getStatsConfig } from './stats'; | <mask> import { t } from 'i18next';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeTextarea } from '../helpers/helpers';
<mask> import { ACTION } from '../helpers/constants';
<mask>
<mask> export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
<mask> export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE');
<mask> export const getAccessListSuccess = createAction('GET_ACCESS_LIST_SUCCESS');
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; </s> remove import React from 'react';
</s> add import React, { Fragment } from 'react'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/access.js |
import { ACTION } from '../helpers/constants'; | <mask> import { getStats, getStatsConfig } from './stats';
<mask> import { normalizeTextarea } from '../helpers/helpers';
<mask>
<mask> export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
<mask> export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE');
<mask> export const getAccessListSuccess = createAction('GET_ACCESS_LIST_SUCCESS');
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/access.js |
allowed_clients: normalizeTextarea(allowed_clients),
disallowed_clients: normalizeTextarea(disallowed_clients),
blocked_hosts: normalizeTextarea(blocked_hosts), | <mask> try {
<mask> const { allowed_clients, disallowed_clients, blocked_hosts } = config;
<mask>
<mask> const values = {
<mask> allowed_clients: (allowed_clients && normalizeTextarea(allowed_clients)) || [],
<mask> disallowed_clients: (disallowed_clients && normalizeTextarea(disallowed_clients)) || [],
<mask> blocked_hosts: (blocked_hosts && normalizeTextarea(blocked_hosts)) || [],
<mask> };
<mask>
<mask> await apiClient.setAccessList(values);
<mask> dispatch(setAccessListSuccess());
<mask> dispatch(addSuccessToast('access_settings_saved'));
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove const { dashboard, stats, t } = this.props;
const statsProcessing = stats.processingStats || stats.processingGetConfig;
</s> add const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/access.js |
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); | <mask> export const setUpstream = config => async (dispatch) => {
<mask> dispatch(setUpstreamRequest());
<mask> try {
<mask> const values = { ...config };
<mask> values.bootstrap_dns = (
<mask> values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
<mask> ) || [];
<mask> values.upstream_dns = (
<mask> values.upstream_dns && normalizeTextarea(values.upstream_dns)
<mask> ) || [];
<mask>
<mask> await apiClient.setUpstream(values);
<mask> dispatch(addSuccessToast('updated_upstream_dns_toast'));
<mask> dispatch(setUpstreamSuccess(config));
<mask> } catch (error) {
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove allowed_clients: (allowed_clients && normalizeTextarea(allowed_clients)) || [],
disallowed_clients: (disallowed_clients && normalizeTextarea(disallowed_clients)) || [],
blocked_hosts: (blocked_hosts && normalizeTextarea(blocked_hosts)) || [],
</s> add allowed_clients: normalizeTextarea(allowed_clients),
disallowed_clients: normalizeTextarea(disallowed_clients),
blocked_hosts: normalizeTextarea(blocked_hosts), </s> remove export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
</s> add export const normalizeTextarea = (text) => {
if (!text) {
return [];
}
return text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
}; </s> remove const { dashboard, stats, t } = this.props;
const statsProcessing = stats.processingStats || stats.processingGetConfig;
</s> add const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/index.js |
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); | <mask> export const testUpstream = config => async (dispatch) => {
<mask> dispatch(testUpstreamRequest());
<mask> try {
<mask> const values = { ...config };
<mask> values.bootstrap_dns = (
<mask> values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
<mask> ) || [];
<mask> values.upstream_dns = (
<mask> values.upstream_dns && normalizeTextarea(values.upstream_dns)
<mask> ) || [];
<mask>
<mask> const upstreamResponse = await apiClient.testUpstream(values);
<mask> const testMessages = Object.keys(upstreamResponse).map((key) => {
<mask> const message = upstreamResponse[key];
<mask> if (message !== 'OK') {
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove allowed_clients: (allowed_clients && normalizeTextarea(allowed_clients)) || [],
disallowed_clients: (disallowed_clients && normalizeTextarea(disallowed_clients)) || [],
blocked_hosts: (blocked_hosts && normalizeTextarea(blocked_hosts)) || [],
</s> add allowed_clients: normalizeTextarea(allowed_clients),
disallowed_clients: normalizeTextarea(disallowed_clients),
blocked_hosts: normalizeTextarea(blocked_hosts), </s> remove export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
</s> add export const normalizeTextarea = (text) => {
if (!text) {
return [];
}
return text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
}; </s> remove const { dashboard, stats, t } = this.props;
const statsProcessing = stats.processingStats || stats.processingGetConfig;
</s> add const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/index.js |
import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; | <mask> import { createAction } from 'redux-actions';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
<mask>
<mask> export const getStatsConfigRequest = createAction('GET_STATS_CONFIG_REQUEST');
<mask> export const getStatsConfigFailure = createAction('GET_STATS_CONFIG_FAILURE');
<mask> export const getStatsConfigSuccess = createAction('GET_STATS_CONFIG_SUCCESS');
<mask>
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove import React from 'react';
</s> add import React, { Fragment } from 'react'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/stats.js |
const accessData = await apiClient.getAccessList();
const { disallowed_clients } = accessData; | <mask> const normalizedTopClients = normalizeTopStats(stats.top_clients);
<mask> const clientsParams = getParamsForClientsSearch(normalizedTopClients, 'name');
<mask> const clients = await apiClient.findClients(clientsParams);
<mask> const topClientsWithInfo = addClientInfo(normalizedTopClients, clients, 'name');
<mask> const topClientsWithStatus = addClientStatus(topClientsWithInfo, disallowed_clients, 'name');
<mask>
<mask> const normalizedStats = {
<mask> ...stats,
<mask> top_blocked_domains: normalizeTopStats(stats.top_blocked_domains),
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove top_clients: topClientsWithInfo,
</s> add top_clients: topClientsWithStatus, </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove allowed_clients: (allowed_clients && normalizeTextarea(allowed_clients)) || [],
disallowed_clients: (disallowed_clients && normalizeTextarea(disallowed_clients)) || [],
blocked_hosts: (blocked_hosts && normalizeTextarea(blocked_hosts)) || [],
</s> add allowed_clients: normalizeTextarea(allowed_clients),
disallowed_clients: normalizeTextarea(disallowed_clients),
blocked_hosts: normalizeTextarea(blocked_hosts), | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/stats.js |
const topClientsWithStatus = addClientStatus(topClientsWithInfo, disallowed_clients, 'name'); | <mask> const accessData = await apiClient.getAccessList();
<mask> const { disallowed_clients } = accessData;
<mask> const topClientsWithInfo = addClientInfo(normalizedTopClients, clients, 'name');
<mask>
<mask> const normalizedStats = {
<mask> ...stats,
<mask> top_blocked_domains: normalizeTopStats(stats.top_blocked_domains),
<mask> top_clients: topClientsWithStatus,
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove top_clients: topClientsWithInfo,
</s> add top_clients: topClientsWithStatus, </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/stats.js |
top_clients: topClientsWithStatus, | <mask>
<mask> const normalizedStats = {
<mask> ...stats,
<mask> top_blocked_domains: normalizeTopStats(stats.top_blocked_domains),
<mask> top_clients: topClientsWithInfo,
<mask> top_queried_domains: normalizeTopStats(stats.top_queried_domains),
<mask> avg_processing_time: secondsToMilliseconds(stats.avg_processing_time),
<mask> };
<mask>
<mask> dispatch(getStatsSuccess(normalizedStats));
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/actions/stats.js |
className="-highlight card-table-overflow stats__table" | <mask> showPagination={false}
<mask> noDataText={t('no_domains_found')}
<mask> minRows={6}
<mask> defaultPageSize={100}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
<mask> };
<mask>
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove className="-striped -highlight card-table-overflow stats__table"
</s> add className="-highlight card-table-overflow stats__table" </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} </s> remove t, refreshButton, topClients, subtitle, dnsQueries,
</s> add t,
refreshButton,
topClients,
subtitle,
dnsQueries,
toggleClientStatus,
processingAccessSet, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/BlockedDomains.js |
import React, { Fragment } from 'react'; | <mask> import React from 'react';
<mask> import ReactTable from 'react-table';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import Card from '../ui/Card';
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
const renderBlockingButton = (blocked, ip, handleClick, processing) => {
let buttonProps = {
className: 'btn-outline-danger',
text: 'block_btn',
type: 'block',
};
if (blocked) {
buttonProps = {
className: 'btn-outline-secondary',
text: 'unblock_btn',
type: 'unblock',
};
}
return (
<div className="table__action">
<button
type="button"
className={`btn btn-sm ${buttonProps.className}`}
onClick={() => handleClick(buttonProps.type, ip)}
disabled={processing}
>
<Trans>{buttonProps.text}</Trans>
</button>
</div>
);
};
const clientCell = (t, toggleClientStatus, processing) => | <mask>
<mask> return <Cell value={value} percent={percent} color={percentColor} />;
<mask> };
<mask>
<mask> const clientCell = t =>
<mask> function cell(row) {
<mask> return (
<mask> <div className="logs__row logs__row--overflow logs__row--column">
<mask> {formatClientCell(row, t)}
<mask> </div>
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove <div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
</s> add <Fragment>
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
{renderBlockingButton(blocked, value, toggleClientStatus, processing)}
</Fragment> </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} </s> remove export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
</s> add export const normalizeTextarea = (text) => {
if (!text) {
return [];
}
return text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
const { original, value } = row;
const { blocked } = original;
| <mask>
<mask> const clientCell = (t, toggleClientStatus, processing) =>
<mask> function cell(row) {
<mask> return (
<mask> <Fragment>
<mask> <div className="logs__row logs__row--overflow logs__row--column">
<mask> {formatClientCell(row, t)}
<mask> </div>
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove <div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
</s> add <Fragment>
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
{renderBlockingButton(blocked, value, toggleClientStatus, processing)}
</Fragment> </s> remove const clientCell = t =>
</s> add const renderBlockingButton = (blocked, ip, handleClick, processing) => {
let buttonProps = {
className: 'btn-outline-danger',
text: 'block_btn',
type: 'block',
};
if (blocked) {
buttonProps = {
className: 'btn-outline-secondary',
text: 'unblock_btn',
type: 'unblock',
};
}
return (
<div className="table__action">
<button
type="button"
className={`btn btn-sm ${buttonProps.className}`}
onClick={() => handleClick(buttonProps.type, ip)}
disabled={processing}
>
<Trans>{buttonProps.text}</Trans>
</button>
</div>
);
};
const clientCell = (t, toggleClientStatus, processing) => </s> remove t, refreshButton, topClients, subtitle, dnsQueries,
</s> add t,
refreshButton,
topClients,
subtitle,
dnsQueries,
toggleClientStatus,
processingAccessSet, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
<Fragment>
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
{renderBlockingButton(blocked, value, toggleClientStatus, processing)}
</Fragment> | <mask>
<mask> const clientCell = t =>
<mask> function cell(row) {
<mask> return (
<mask> <div className="logs__row logs__row--overflow logs__row--column">
<mask> {formatClientCell(row, t)}
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> const Clients = ({
<mask> t, refreshButton, topClients, subtitle, dnsQueries,
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove t, refreshButton, topClients, subtitle, dnsQueries,
</s> add t,
refreshButton,
topClients,
subtitle,
dnsQueries,
toggleClientStatus,
processingAccessSet, </s> remove const clientCell = t =>
</s> add const renderBlockingButton = (blocked, ip, handleClick, processing) => {
let buttonProps = {
className: 'btn-outline-danger',
text: 'block_btn',
type: 'block',
};
if (blocked) {
buttonProps = {
className: 'btn-outline-secondary',
text: 'unblock_btn',
type: 'unblock',
};
}
return (
<div className="table__action">
<button
type="button"
className={`btn btn-sm ${buttonProps.className}`}
onClick={() => handleClick(buttonProps.type, ip)}
disabled={processing}
>
<Trans>{buttonProps.text}</Trans>
</button>
</div>
);
};
const clientCell = (t, toggleClientStatus, processing) => </s> remove const { dashboard, stats, t } = this.props;
const statsProcessing = stats.processingStats || stats.processingGetConfig;
</s> add const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
t,
refreshButton,
topClients,
subtitle,
dnsQueries,
toggleClientStatus,
processingAccessSet, | <mask> );
<mask> };
<mask>
<mask> const Clients = ({
<mask> t, refreshButton, topClients, subtitle, dnsQueries,
<mask> }) => (
<mask> <Card
<mask> title={t('top_clients')}
<mask> subtitle={subtitle}
<mask> bodyType="card-table"
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove <div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
</s> add <Fragment>
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
{renderBlockingButton(blocked, value, toggleClientStatus, processing)}
</Fragment> </s> remove data={topClients.map(({ name: ip, count, info }) => ({
</s> add data={topClients.map(({
name: ip, count, info, blocked,
}) => ({ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
data={topClients.map(({
name: ip, count, info, blocked,
}) => ({ | <mask> bodyType="card-table"
<mask> refresh={refreshButton}
<mask> >
<mask> <ReactTable
<mask> data={topClients.map(({ name: ip, count, info }) => ({
<mask> ip,
<mask> count,
<mask> info,
<mask> }))}
<mask> columns={[
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove t, refreshButton, topClients, subtitle, dnsQueries,
</s> add t,
refreshButton,
topClients,
subtitle,
dnsQueries,
toggleClientStatus,
processingAccessSet, </s> remove const clientCell = t =>
</s> add const renderBlockingButton = (blocked, ip, handleClick, processing) => {
let buttonProps = {
className: 'btn-outline-danger',
text: 'block_btn',
type: 'block',
};
if (blocked) {
buttonProps = {
className: 'btn-outline-secondary',
text: 'unblock_btn',
type: 'unblock',
};
}
return (
<div className="table__action">
<button
type="button"
className={`btn btn-sm ${buttonProps.className}`}
onClick={() => handleClick(buttonProps.type, ip)}
disabled={processing}
>
<Trans>{buttonProps.text}</Trans>
</button>
</div>
);
};
const clientCell = (t, toggleClientStatus, processing) => | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
blocked, | <mask> count,
<mask> info,
<mask> }))}
<mask> columns={[
<mask> {
<mask> Header: 'IP',
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove data={topClients.map(({ name: ip, count, info }) => ({
</s> add data={topClients.map(({
name: ip, count, info, blocked,
}) => ({ </s> remove Cell: clientCell(t),
</s> add Cell: clientCell(t, toggleClientStatus, processingAccessSet), </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} </s> remove .logs__table .rt-tr:hover .logs__action {
</s> add .logs__table .rt-tr:hover .logs__action,
.clients__table .rt-tr:hover .table__action { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
Cell: clientCell(t, toggleClientStatus, processingAccessSet), | <mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> sortMethod: (a, b) =>
<mask> parseInt(a.replace(/\./g, ''), 10) - parseInt(b.replace(/\./g, ''), 10),
<mask> Cell: clientCell(t),
<mask> },
<mask> {
<mask> Header: <Trans>requests_count</Trans>,
<mask> accessor: 'count',
<mask> minWidth: 180,
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} | <mask> showPagination={false}
<mask> noDataText={t('no_clients_found')}
<mask> minRows={6}
<mask> defaultPageSize={100}
<mask> className="-striped -highlight card-table-overflow"
<mask> />
<mask> </Card>
<mask> );
<mask>
<mask> Clients.propTypes = {
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove className="-striped -highlight card-table-overflow stats__table"
</s> add className="-highlight card-table-overflow stats__table" </s> remove className="-striped -highlight card-table-overflow stats__table"
</s> add className="-highlight card-table-overflow stats__table" </s> remove const { dashboard, stats, t } = this.props;
const statsProcessing = stats.processingStats || stats.processingGetConfig;
</s> add const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
toggleClientStatus: PropTypes.func.isRequired,
processingAccessSet: PropTypes.bool.isRequired, | <mask> autoClients: PropTypes.array.isRequired,
<mask> subtitle: PropTypes.string.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Clients);
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/Clients.js |
className="-highlight card-table-overflow stats__table" | <mask> showPagination={false}
<mask> noDataText={t('no_domains_found')}
<mask> minRows={6}
<mask> defaultPageSize={100}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
<mask>
<mask> QueriedDomains.propTypes = {
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove className="-striped -highlight card-table-overflow stats__table"
</s> add className="-highlight card-table-overflow stats__table" </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} </s> remove const { dashboard, stats, t } = this.props;
const statsProcessing = stats.processingStats || stats.processingGetConfig;
</s> add const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/QueriedDomains.js |
import { ACTION } from '../../helpers/constants'; | <mask> import BlockedDomains from './BlockedDomains';
<mask>
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Loading from '../ui/Loading';
<mask> import './Dashboard.css';
<mask>
<mask> class Dashboard extends Component {
<mask> componentDidMount() {
<mask> this.getAllStats();
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove import React from 'react';
</s> add import React, { Fragment } from 'react'; </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/index.js |
toggleClientStatus = (type, ip) => {
const confirmMessage = type === ACTION.block ? 'client_confirm_block' : 'client_confirm_unblock';
if (window.confirm(this.props.t(confirmMessage, { ip }))) {
this.props.toggleClientBlock(type, ip);
}
};
| <mask> );
<mask> };
<mask>
<mask> render() {
<mask> const {
<mask> dashboard, stats, access, t,
<mask> } = this.props;
<mask> const statsProcessing = stats.processingStats
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove const { dashboard, stats, t } = this.props;
const statsProcessing = stats.processingStats || stats.processingGetConfig;
</s> add const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/index.js |
const {
dashboard, stats, access, t,
} = this.props;
const statsProcessing = stats.processingStats
|| stats.processingGetConfig; | <mask> );
<mask> };
<mask>
<mask> render() {
<mask> const { dashboard, stats, t } = this.props;
<mask> const statsProcessing = stats.processingStats || stats.processingGetConfig;
<mask>
<mask> const subtitle =
<mask> stats.interval === 1
<mask> ? t('for_last_24_hours')
<mask> : t('for_last_days', { count: stats.interval });
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/index.js |
toggleClientStatus={this.toggleClientStatus}
processingAccessSet={access.processingSet} | <mask> clients={dashboard.clients}
<mask> autoClients={dashboard.autoClients}
<mask> refreshButton={refreshButton}
<mask> />
<mask> </div>
<mask> <div className="col-lg-6">
<mask> <QueriedDomains
<mask> subtitle={subtitle}
<mask> dnsQueries={stats.numDnsQueries}
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove <div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
</s> add <Fragment>
<div className="logs__row logs__row--overflow logs__row--column">
{formatClientCell(row, t)}
</div>
{renderBlockingButton(blocked, value, toggleClientStatus, processing)}
</Fragment> </s> remove const clientCell = t =>
</s> add const renderBlockingButton = (blocked, ip, handleClick, processing) => {
let buttonProps = {
className: 'btn-outline-danger',
text: 'block_btn',
type: 'block',
};
if (blocked) {
buttonProps = {
className: 'btn-outline-secondary',
text: 'unblock_btn',
type: 'unblock',
};
}
return (
<div className="table__action">
<button
type="button"
className={`btn btn-sm ${buttonProps.className}`}
onClick={() => handleClick(buttonProps.type, ip)}
disabled={processing}
>
<Trans>{buttonProps.text}</Trans>
</button>
</div>
);
};
const clientCell = (t, toggleClientStatus, processing) => </s> remove t, refreshButton, topClients, subtitle, dnsQueries,
</s> add t,
refreshButton,
topClients,
subtitle,
dnsQueries,
toggleClientStatus,
processingAccessSet, </s> remove className="-striped -highlight card-table-overflow stats__table"
</s> add className="-highlight card-table-overflow stats__table" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/index.js |
access: PropTypes.object.isRequired, | <mask>
<mask> Dashboard.propTypes = {
<mask> dashboard: PropTypes.object.isRequired,
<mask> stats: PropTypes.object.isRequired,
<mask> getStats: PropTypes.func.isRequired,
<mask> getStatsConfig: PropTypes.func.isRequired,
<mask> toggleProtection: PropTypes.func.isRequired,
<mask> getClients: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> toggleClientBlock: PropTypes.func.isRequired,
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/index.js |
toggleClientBlock: PropTypes.func.isRequired,
getAccessList: PropTypes.func.isRequired, | <mask> getClients: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Dashboard);
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Dashboard/index.js |
.logs__action,
.table__action { | <mask> margin-left: 0;
<mask> margin-right: 5px;
<mask> }
<mask>
<mask> .logs__action {
<mask> position: absolute;
<mask> top: 10px;
<mask> right: 15px;
<mask> background-color: #fff;
<mask> border-radius: 4px;
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove top: 10px;
</s> add top: 11px; </s> remove .logs__table .rt-td {
</s> add .logs__table .rt-td,
.clients__table .rt-td { </s> remove .logs__table .rt-tr:hover .logs__action {
</s> add .logs__table .rt-tr:hover .logs__action,
.clients__table .rt-tr:hover .table__action { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Logs/Logs.css |
top: 11px; | <mask> }
<mask>
<mask> .logs__action {
<mask> position: absolute;
<mask> top: 10px;
<mask> right: 15px;
<mask> background-color: #fff;
<mask> border-radius: 4px;
<mask> transition: opacity 0.2s ease, visibility 0.2s ease;
<mask> visibility: hidden;
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove .logs__action {
</s> add .logs__action,
.table__action { </s> remove .logs__table .rt-td {
</s> add .logs__table .rt-td,
.clients__table .rt-td { </s> remove .logs__table .rt-tr:hover .logs__action {
</s> add .logs__table .rt-tr:hover .logs__action,
.clients__table .rt-tr:hover .table__action { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Logs/Logs.css |
.logs__table .rt-td,
.clients__table .rt-td { | <mask> visibility: hidden;
<mask> opacity: 0;
<mask> }
<mask>
<mask> .logs__table .rt-td {
<mask> position: relative;
<mask> }
<mask>
<mask> .logs__table .rt-tr:hover .logs__action {
<mask> visibility: visible;
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove .logs__table .rt-tr:hover .logs__action {
</s> add .logs__table .rt-tr:hover .logs__action,
.clients__table .rt-tr:hover .table__action { </s> remove top: 10px;
</s> add top: 11px; </s> remove .logs__action {
</s> add .logs__action,
.table__action { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Logs/Logs.css |
.logs__table .rt-tr:hover .logs__action,
.clients__table .rt-tr:hover .table__action { | <mask> .logs__table .rt-td {
<mask> position: relative;
<mask> }
<mask>
<mask> .logs__table .rt-tr:hover .logs__action {
<mask> visibility: visible;
<mask> opacity: 1;
<mask> }
<mask>
<mask> .logs__table .rt-tr-group:first-child .tooltip-custom:before {
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove .logs__table .rt-td {
</s> add .logs__table .rt-td,
.clients__table .rt-td { </s> remove top: 10px;
</s> add top: 11px; </s> remove .logs__action {
</s> add .logs__action,
.table__action { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/components/Logs/Logs.css |
import { toggleClientBlock, getAccessList } from '../actions/access'; | <mask> import { toggleProtection, getClients } from '../actions';
<mask> import { getStats, getStatsConfig, setStatsConfig } from '../actions/stats';
<mask> import Dashboard from '../components/Dashboard';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { dashboard, stats, access } = state;
<mask> const props = { dashboard, stats, access };
<mask> return props;
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/containers/Dashboard.js |
const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; | <mask> import { getStats, getStatsConfig, setStatsConfig } from '../actions/stats';
<mask> import Dashboard from '../components/Dashboard';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { dashboard, stats } = state;
<mask> const props = { dashboard, stats };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> toggleProtection,
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/containers/Dashboard.js |
toggleClientBlock,
getAccessList, | <mask> getClients,
<mask> getStats,
<mask> getStatsConfig,
<mask> setStatsConfig,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/containers/Dashboard.js |
export const addClientStatus = (data, disallowedClients, param) => (
data.map((row) => {
const clientIp = row[param];
const blocked = !!(disallowedClients && disallowedClients.includes(clientIp));
return {
...row,
blocked,
};
})
);
| <mask> })
<mask> );
<mask>
<mask> export const normalizeFilteringStatus = (filteringStatus) => {
<mask> const {
<mask> enabled, filters, user_rules: userRules, interval,
<mask> } = filteringStatus;
<mask> const newFilters = filters
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
</s> add import { normalizeTopStats, secondsToMilliseconds, getParamsForClientsSearch, addClientInfo, addClientStatus } from '../helpers/helpers'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/helpers/helpers.js |
export const normalizeTextarea = (text) => {
if (!text) {
return [];
}
return text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
}; | <mask> window.location.replace(`http://${hostname}:${httpPort}/${hash}`);
<mask> }
<mask> };
<mask>
<mask> export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
<mask>
<mask> /**
<mask> * Normalizes the topClients array
<mask> *
<mask> * @param {Object[]} topClients
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); </s> remove values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
</s> add values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/helpers/helpers.js |
[actions.toggleClientBlockRequest]: state => ({ ...state, processingSet: true }),
[actions.toggleClientBlockFailure]: state => ({ ...state, processingSet: false }),
[actions.toggleClientBlockSuccess]: state => ({ ...state, processingSet: false }), | <mask> };
<mask> return newState;
<mask> },
<mask> },
<mask> {
<mask> processing: true,
<mask> processingSet: false,
</s> Merge: + client: handle client block and unblock from the top clients table
Closes #896
Squashed commit of the following:
commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 30 11:13:41 2020 +0300
- client: fix normalizeTextarea and blocking button
commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 29 17:19:50 2020 +0300
+ client: handle client block and unblock from the top clients table </s> remove Cell: clientCell(t),
</s> add Cell: clientCell(t, toggleClientStatus, processingAccessSet), </s> remove className="-striped -highlight card-table-overflow"
</s> add className="-highlight card-table-overflow clients__table"
getTrProps={(_state, rowInfo) => {
if (!rowInfo) {
return {};
}
const { blocked } = rowInfo.original;
if (blocked) {
return {
className: 'red',
};
}
return {
className: '',
};
}} </s> remove const clientCell = t =>
</s> add const renderBlockingButton = (blocked, ip, handleClick, processing) => {
let buttonProps = {
className: 'btn-outline-danger',
text: 'block_btn',
type: 'block',
};
if (blocked) {
buttonProps = {
className: 'btn-outline-secondary',
text: 'unblock_btn',
type: 'unblock',
};
}
return (
<div className="table__action">
<button
type="button"
className={`btn btn-sm ${buttonProps.className}`}
onClick={() => handleClick(buttonProps.type, ip)}
disabled={processing}
>
<Trans>{buttonProps.text}</Trans>
</button>
</div>
);
};
const clientCell = (t, toggleClientStatus, processing) => </s> remove export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
</s> add export const normalizeTextarea = (text) => {
if (!text) {
return [];
}
return text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
}; </s> remove const { dashboard, stats } = state;
const props = { dashboard, stats };
</s> add const { dashboard, stats, access } = state;
const props = { dashboard, stats, access }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5c814b29e186a79678c3c96f7a741f44c3f2cec9 | client/src/reducers/access.js |
<mask>
<mask> import (
<mask> "crypto/tls"
<mask> "fmt"
<mask> stdlog "log"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/signal"
<mask> "path/filepath"
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
|
"github.com/AdguardTeam/golibs/log" | <mask> "sync"
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/gobuffalo/packr"
<mask> )
<mask>
<mask> // VersionString will be set through ldflags, contains current version
<mask> var VersionString = "undefined"
<mask> var httpServer *http.Server
</s> * use new logger - AdguardTeam/golibs/log </s> remove
"github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/gobuffalo/packr"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> // VersionString will be set through ldflags, contains current version
<mask> var VersionString = "undefined"
<mask> var httpServer *http.Server
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
|
log.Debug("Current working directory is %s", config.ourWorkingDir) | <mask> configureLogger(args)
<mask>
<mask> // print the first message after logger is configured
<mask> log.Printf("AdGuard Home, version %s\n", VersionString)
<mask> log.Tracef("Current working directory is %s", config.ourWorkingDir)
<mask> if args.runningAsService {
<mask> log.Printf("AdGuard Home is running as a service")
<mask> }
<mask>
<mask> config.firstRun = detectFirstRun()
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("AdGuard Home is running as a service")
</s> add log.Info("AdGuard Home is running as a service") </s> remove log.Printf("This is the first launch of AdGuard Home, redirecting everything to /install.html ")
</s> add log.Info("This is the first launch of AdGuard Home, redirecting everything to /install.html ") </s> remove log.Verbose = ls.Verbose
</s> add level := log.INFO
if ls.Verbose {
level = log.DEBUG
}
log.SetLevel(level) </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Info("AdGuard Home is running as a service") | <mask> // print the first message after logger is configured
<mask> log.Printf("AdGuard Home, version %s\n", VersionString)
<mask> log.Tracef("Current working directory is %s", config.ourWorkingDir)
<mask> if args.runningAsService {
<mask> log.Printf("AdGuard Home is running as a service")
<mask> }
<mask>
<mask> config.firstRun = detectFirstRun()
<mask>
<mask> // Do the upgrade if necessary
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Tracef("Current working directory is %s", config.ourWorkingDir)
</s> add log.Debug("Current working directory is %s", config.ourWorkingDir) </s> remove log.Printf("This is the first launch of AdGuard Home, redirecting everything to /install.html ")
</s> add log.Info("This is the first launch of AdGuard Home, redirecting everything to /install.html ") </s> remove log.Verbose = ls.Verbose
</s> add level := log.INFO
if ls.Verbose {
level = log.DEBUG
}
log.SetLevel(level) </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) | <mask> }
<mask> err = filter.load()
<mask> if err != nil {
<mask> // This is okay for the first start, the filter will be loaded later
<mask> log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
<mask> // clear LastUpdated so it gets fetched right away
<mask> }
<mask>
<mask> if len(filter.Rules) == 0 {
<mask> filter.LastUpdated = time.Time{}
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't save the user filter: %s", err)
</s> add log.Error("Couldn't save the user filter: %s", err) </s> remove log.Printf("Couldn't get logging settings from the configuration: %s", err)
</s> add log.Error("Couldn't get logging settings from the configuration: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Info("This is the first launch of AdGuard Home, redirecting everything to /install.html ") | <mask> registerControlHandlers()
<mask>
<mask> // add handlers for /install paths, we only need them when we're not configured yet
<mask> if config.firstRun {
<mask> log.Printf("This is the first launch of AdGuard Home, redirecting everything to /install.html ")
<mask> http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
<mask> registerInstallHandlers()
<mask> }
<mask>
<mask> httpsServer.cond = sync.NewCond(&httpsServer.Mutex)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("AdGuard Home is running as a service")
</s> add log.Info("AdGuard Home is running as a service") </s> remove log.Tracef("Current working directory is %s", config.ourWorkingDir)
</s> add log.Debug("Current working directory is %s", config.ourWorkingDir) </s> remove log.Tracef("Silently refusing to write config because first run and not configured yet")
</s> add log.Debug("Silently refusing to write config because first run and not configured yet") </s> remove log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
level := log.INFO
if ls.Verbose {
level = log.DEBUG
}
log.SetLevel(level) | <mask> if args.logFile != "" {
<mask> ls.LogFile = args.logFile
<mask> }
<mask>
<mask> log.Verbose = ls.Verbose
<mask>
<mask> if args.runningAsService && ls.LogFile == "" && runtime.GOOS == "windows" {
<mask> // When running as a Windows service, use eventlog by default if nothing else is configured
<mask> // Otherwise, we'll simply loose the log output
<mask> ls.LogFile = configSyslog
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("AdGuard Home is running as a service")
</s> add log.Info("AdGuard Home is running as a service") </s> remove log.Printf("ERROR: Got %s without argument\n", v)
</s> add log.Error("Got %s without argument\n", v) </s> remove log.Tracef("Current working directory is %s", config.ourWorkingDir)
</s> add log.Debug("Current working directory is %s", config.ourWorkingDir) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.SetOutput(file) | <mask> file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0755)
<mask> if err != nil {
<mask> log.Fatalf("cannot create a log file: %s", err)
<mask> }
<mask> stdlog.SetOutput(file)
<mask> }
<mask> }
<mask>
<mask> func cleanup() {
<mask> log.Printf("Stopping AdGuard Home")
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Stopping AdGuard Home")
</s> add log.Info("Stopping AdGuard Home") </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Info("Stopping AdGuard Home") | <mask> }
<mask> }
<mask>
<mask> func cleanup() {
<mask> log.Printf("Stopping AdGuard Home")
<mask>
<mask> err := stopDNSServer()
<mask> if err != nil {
<mask> log.Printf("Couldn't stop DNS server: %s", err)
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove stdlog.SetOutput(file)
</s> add log.SetOutput(file) </s> remove log.Printf("Couldn't stop DHCP server: %s", err)
</s> add log.Error("Couldn't stop DHCP server: %s", err) </s> remove log.Printf("failed to stop the DHCP server: %s", err)
</s> add log.Error("failed to stop the DHCP server: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Error("Couldn't stop DNS server: %s", err) | <mask> log.Printf("Stopping AdGuard Home")
<mask>
<mask> err := stopDNSServer()
<mask> if err != nil {
<mask> log.Printf("Couldn't stop DNS server: %s", err)
<mask> }
<mask> err = stopDHCPServer()
<mask> if err != nil {
<mask> log.Printf("Couldn't stop DHCP server: %s", err)
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Stopping AdGuard Home")
</s> add log.Info("Stopping AdGuard Home") </s> remove log.Printf("Couldn't stop DHCP server: %s", err)
</s> add log.Error("Couldn't stop DHCP server: %s", err) </s> remove log.Printf("failed to stop the DHCP server: %s", err)
</s> add log.Error("failed to stop the DHCP server: %s", err) </s> remove stdlog.SetOutput(file)
</s> add log.SetOutput(file) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Error("Couldn't stop DHCP server: %s", err) | <mask> log.Printf("Couldn't stop DNS server: %s", err)
<mask> }
<mask> err = stopDHCPServer()
<mask> if err != nil {
<mask> log.Printf("Couldn't stop DHCP server: %s", err)
<mask> }
<mask> }
<mask>
<mask> // command-line arguments
<mask> type options struct {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("failed to stop the DHCP server: %s", err)
</s> add log.Error("failed to stop the DHCP server: %s", err) </s> remove log.Printf("Stopping AdGuard Home")
</s> add log.Info("Stopping AdGuard Home") </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Error("Got %s without argument\n", v) | <mask> for _, opt := range opts {
<mask> if v == "--"+opt.longName || (opt.shortName != "" && v == "-"+opt.shortName) {
<mask> if opt.callbackWithValue != nil {
<mask> if i+1 >= len(os.Args) {
<mask> log.Printf("ERROR: Got %s without argument\n", v)
<mask> os.Exit(64)
<mask> }
<mask> i++
<mask> opt.callbackWithValue(os.Args[i])
<mask> } else if opt.callbackNoValue != nil {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Verbose = ls.Verbose
</s> add level := log.INFO
if ls.Verbose {
level = log.DEBUG
}
log.SetLevel(level) </s> remove log.Println(err)
</s> add log.Info("%v", err) </s> remove log.Printf("ERROR: unknown option %v\n", v)
</s> add log.Error("unknown option %v\n", v) </s> remove log.Printf("Checking if DNS %s works...", input)
</s> add log.Debug("Checking if DNS %s works...", input) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
log.Error("unknown option %v\n", v) | <mask> break
<mask> }
<mask> }
<mask> if !knownParam {
<mask> log.Printf("ERROR: unknown option %v\n", v)
<mask> printHelp()
<mask> os.Exit(64)
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("ERROR: Got %s without argument\n", v)
</s> add log.Error("Got %s without argument\n", v) </s> remove log.Printf("failed to stop the DHCP server: %s", err)
</s> add log.Error("failed to stop the DHCP server: %s", err) </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) </s> remove log.Printf("Stopping AdGuard Home")
</s> add log.Info("Stopping AdGuard Home") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | app.go |
"github.com/AdguardTeam/golibs/log" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/hmage/golibs/log"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
<mask> dataDir = "data" // data storage
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("Couldn't get logging settings from the configuration: %s", err) | <mask> return l
<mask> }
<mask> err = yaml.Unmarshal(yamlFile, &l)
<mask> if err != nil {
<mask> log.Printf("Couldn't get logging settings from the configuration: %s", err)
<mask> }
<mask> return l
<mask> }
<mask>
<mask> // parseConfig loads configuration from the YAML file
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) </s> remove log.Printf("YAML file doesn't exist, skipping it")
</s> add log.Error("YAML file doesn't exist, skipping it") </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err) </s> remove log.Printf("Couldn't save the user filter: %s", err)
</s> add log.Error("Couldn't save the user filter: %s", err) </s> remove log.Printf("Couldn't parse config file: %s", err)
</s> add log.Error("Couldn't parse config file: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Debug("Reading config file: %s", configFile) | <mask>
<mask> // parseConfig loads configuration from the YAML file
<mask> func parseConfig() error {
<mask> configFile := config.getConfigFilename()
<mask> log.Printf("Reading config file: %s", configFile)
<mask> yamlFile, err := readConfigFile()
<mask> if err != nil {
<mask> log.Printf("Couldn't read config file: %s", err)
<mask> return err
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Printf("Couldn't get logging settings from the configuration: %s", err)
</s> add log.Error("Couldn't get logging settings from the configuration: %s", err) </s> remove log.Printf("YAML file doesn't exist, skipping it")
</s> add log.Error("YAML file doesn't exist, skipping it") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("Couldn't read config file: %s", err) | <mask> configFile := config.getConfigFilename()
<mask> log.Printf("Reading config file: %s", configFile)
<mask> yamlFile, err := readConfigFile()
<mask> if err != nil {
<mask> log.Printf("Couldn't read config file: %s", err)
<mask> return err
<mask> }
<mask> if yamlFile == nil {
<mask> log.Printf("YAML file doesn't exist, skipping it")
<mask> return nil
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("YAML file doesn't exist, skipping it")
</s> add log.Error("YAML file doesn't exist, skipping it") </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Printf("Couldn't parse config file: %s", err)
</s> add log.Error("Couldn't parse config file: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("YAML file doesn't exist, skipping it") | <mask> log.Printf("Couldn't read config file: %s", err)
<mask> return err
<mask> }
<mask> if yamlFile == nil {
<mask> log.Printf("YAML file doesn't exist, skipping it")
<mask> return nil
<mask> }
<mask> err = yaml.Unmarshal(yamlFile, &config)
<mask> if err != nil {
<mask> log.Printf("Couldn't parse config file: %s", err)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove log.Printf("Couldn't parse config file: %s", err)
</s> add log.Error("Couldn't parse config file: %s", err) </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("Couldn't parse config file: %s", err) | <mask> return nil
<mask> }
<mask> err = yaml.Unmarshal(yamlFile, &config)
<mask> if err != nil {
<mask> log.Printf("Couldn't parse config file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> // Deduplicate filters
<mask> deduplicateFilters()
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("YAML file doesn't exist, skipping it")
</s> add log.Error("YAML file doesn't exist, skipping it") </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Debug("Silently refusing to write config because first run and not configured yet") | <mask> func (c *configuration) write() error {
<mask> c.Lock()
<mask> defer c.Unlock()
<mask> if config.firstRun {
<mask> log.Tracef("Silently refusing to write config because first run and not configured yet")
<mask> return nil
<mask> }
<mask> configFile := config.getConfigFilename()
<mask> log.Tracef("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove
</s> add log.Error("Couldn't write all configs: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Debug("Writing YAML file: %s", configFile) | <mask> log.Tracef("Silently refusing to write config because first run and not configured yet")
<mask> return nil
<mask> }
<mask> configFile := config.getConfigFilename()
<mask> log.Tracef("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Tracef("Silently refusing to write config because first run and not configured yet")
</s> add log.Debug("Silently refusing to write config because first run and not configured yet") </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove log.Printf("Couldn't parse config file: %s", err)
</s> add log.Error("Couldn't parse config file: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("Couldn't generate YAML file: %s", err) | <mask> configFile := config.getConfigFilename()
<mask> log.Tracef("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask> err = safeWriteFile(configFile, yamlText)
<mask> if err != nil {
<mask> log.Printf("Couldn't save YAML config: %s", err)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err) </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove log.Tracef("Silently refusing to write config because first run and not configured yet")
</s> add log.Debug("Silently refusing to write config because first run and not configured yet") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("Couldn't save YAML config: %s", err) | <mask> return err
<mask> }
<mask> err = safeWriteFile(configFile, yamlText)
<mask> if err != nil {
<mask> log.Printf("Couldn't save YAML config: %s", err)
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Printf("Couldn't save the user filter: %s", err)
</s> add log.Error("Couldn't save the user filter: %s", err) </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("Couldn't write config: %s", err) | <mask>
<mask> func writeAllConfigs() error {
<mask> err := config.write()
<mask> if err != nil {
<mask> log.Printf("Couldn't write config: %s", err)
<mask> return err
<mask> }
<mask>
<mask> userFilter := userFilter()
<mask> err = userFilter.save()
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't save the user filter: %s", err)
</s> add log.Error("Couldn't save the user filter: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
log.Error("Couldn't save the user filter: %s", err) | <mask>
<mask> userFilter := userFilter()
<mask> err = userFilter.save()
<mask> if err != nil {
<mask> log.Printf("Couldn't save the user filter: %s", err)
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | config.go |
"github.com/AdguardTeam/golibs/log" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> govalidator "gopkg.in/asaskevich/govalidator.v4"
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> govalidator "gopkg.in/asaskevich/govalidator.v4"
<mask> )
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
|
log.Error(errorText) | <mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> }
<mask> }
<mask>
<mask> func httpError(w http.ResponseWriter, code int, format string, args ...interface{}) {
<mask> text := fmt.Sprintf(format, args...)
<mask> log.Println(text)
<mask> http.Error(w, text, code)
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(text)
</s> add log.Info(text) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
log.Info(text) | <mask> }
<mask>
<mask> func httpError(w http.ResponseWriter, code int, format string, args ...interface{}) {
<mask> text := fmt.Sprintf(format, args...)
<mask> log.Println(text)
<mask> http.Error(w, text, code)
<mask> }
<mask>
<mask> // ---------------
<mask> // dns run control
</s> * use new logger - AdguardTeam/golibs/log </s> remove func httpError(w http.ResponseWriter, code int, format string, args ...interface{}) {
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Tracef("Silently refusing to write config because first run and not configured yet")
</s> add log.Debug("Silently refusing to write config because first run and not configured yet") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
log.Error("Couldn't write all configs: %s", err) | <mask> return err
<mask> }
<mask> return reconfigureDNSServer()
<mask> }
<mask>
<mask> func httpUpdateConfigReloadDNSReturnOK(w http.ResponseWriter, r *http.Request) {
<mask> err := writeAllConfigsAndReloadDNS()
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errorText)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Couldn't read config file: %s", err)
</s> add log.Error("Couldn't read config file: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
log.Tracef("") | <mask>
<mask> func handleStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := map[string]interface{}{
<mask> "dns_address": config.DNS.BindHost,
<mask> "http_port": config.BindPort,
<mask> "dns_port": config.DNS.Port,
<mask> "protection_enabled": config.DNS.ProtectionEnabled,
<mask> "querylog_enabled": config.DNS.QueryLogEnabled,
</s> * use new logger - AdguardTeam/golibs/log | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
log.Error(errorText) | <mask>
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to marshal status json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
log.Error(errorText) | <mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, 500)
<mask> return
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
log.Tracef("") | <mask> }
<mask>
<mask> func handleProtectionEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.ProtectionEnabled = true
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleProtectionDisable(w http.ResponseWriter, r *http.Request) {
</s> * use new logger - AdguardTeam/golibs/log | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | control.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.